Skip to content

Commit f992139

Browse files
committed
fix: ensure cflags are not mixed between windows and linux
1 parent 8aa3c2f commit f992139

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

bindings/node/etc/build-static.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ pushd $TOP_DIR
2929
# NOTE: On OSX, -DCMAKE_OSX_DEPLOYMENT_TARGET can be set to an OSX version
3030
# to suppress build warnings. However, doing that tends to break some
3131
# of the versions that can be built
32-
export BSON_EXTRA_CMAKE_FLAGS="-DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_OSX_DEPLOYMENT_TARGET=\"10.12\" -DCMAKE_C_FLAGS_RELWITHDEBINFO=\"/MT\""
32+
export BSON_EXTRA_CMAKE_FLAGS="-DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_OSX_DEPLOYMENT_TARGET=\"10.12\""
33+
if [ "$OS" == "Windows_NT" ]; then
34+
export BSON_EXTRA_CMAKE_FLAGS="${BSON_EXTRA_CMAKE_FLAGS} -DCMAKE_C_FLAGS_RELWITHDEBINFO=\"/MT\""
35+
fi
36+
3337
. ${TOP_DIR}/libmongocrypt/.evergreen/build_install_bson.sh
3438

3539
popd #./deps/tmp
@@ -40,7 +44,7 @@ pushd libmongocrypt-build #./deps/tmp/libmongocrypt-build
4044
CMAKE_FLAGS="-DDISABLE_NATIVE_CRYPTO=1 -DCMAKE_C_FLAGS=\"-fPIC\" -DCMAKE_INSTALL_LIBDIR=lib "
4145
if [ "$OS" == "Windows_NT" ]; then
4246
WINDOWS_CMAKE_FLAGS="-Thost=x64 -A x64 -DCMAKE_C_FLAGS_RELWITHDEBINFO=\"/MT\""
43-
$CMAKE $CMAKE_FLAGS $WINDOWS_CMAKE_FLAGS -DCMAKE_PREFIX_PATH=$DEPS_PREFIX -DCMAKE_INSTALL_PREFIX=$DEPS_PREFIX "`cygpath -w $LIBMONGOCRYPT_DIR`"
47+
$CMAKE $CMAKE_FLAGS $WINDOWS_CMAKE_FLAGS -DCMAKE_PREFIX_PATH="`cygpath -w $DEPS_PREFIX`" -DCMAKE_INSTALL_PREFIX="`cygpath -w $DEPS_PREFIX`" "`cygpath -w $LIBMONGOCRYPT_DIR`"
4448
else
4549
$CMAKE $CMAKE_FLAGS -DCMAKE_PREFIX_PATH=$DEPS_PREFIX -DCMAKE_INSTALL_PREFIX=$DEPS_PREFIX -DCMAKE_OSX_DEPLOYMENT_TARGET="10.12" $LIBMONGOCRYPT_DIR
4650
fi

0 commit comments

Comments
 (0)