diff options
Diffstat (limited to 'etc/evergreen.yml')
| -rw-r--r-- | etc/evergreen.yml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index 47779454e3b..93057bdd70c 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1516,7 +1516,7 @@ functions: ${activate_virtualenv} set +o errexit - ${compile_env|} $python ./buildscripts/scons.py ${compile_flags|} ${task_compile_flags|} ${scons_cache_args|} $extra_args ${targets} ${additional_targets|} MONGO_VERSION=${version} + ${compile_env|} $python ./buildscripts/scons.py ${compile_flags|} ${task_compile_flags|} ${task_compile_flags_extra|} ${scons_cache_args|} $extra_args ${targets} ${additional_targets|} MONGO_VERSION=${version} exit_status=$? # If compile fails we do not run any tests if [ $exit_status -ne 0 ]; then @@ -3578,7 +3578,6 @@ tasks: task_compile_flags: &embedded_sdk_compile_flags >- --install-mode=hygienic --js-engine=none - --link-model=dynamic --prefix='$BUILD_ROOT/mongo-embedded-sdk-$MONGO_VERSION' --dbg=off --opt=size @@ -3588,6 +3587,8 @@ tasks: --wiredtiger=off --allocator=system CPPPATH='$BUILD_ROOT/mongo-embedded-sdk-$MONGO_VERSION/include/libbson-1.0 $BUILD_ROOT/mongo-embedded-sdk-$MONGO_VERSION/include/libmongoc-1.0' + task_compile_flags_extra: >- + --link-model=dynamic-sdk - name: embedded_sdk_s3_put commands: @@ -3620,6 +3621,8 @@ tasks: vars: targets: install-embedded-test task_compile_flags: *embedded_sdk_compile_flags + task_compile_flags_extra: >- + --link-model=dynamic - name: embedded_sdk_tests_s3_put commands: @@ -10428,13 +10431,11 @@ buildvariants: -j$(grep -c ^processor /proc/cpuinfo) --variables-files=etc/scons/mongodbtoolchain_gcc.vars LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib" - --lto cdriver_cmake_flags: >- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER=/opt/mongodbtoolchain/v2/bin/gcc -DCMAKE_CXX_COMPILER=/opt/mongodbtoolchain/v2/bin/g++ -DCMAKE_C_FLAGS="-flto" - -DCMAKE_SHARED_LINKER_FLAGS="-flto" -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib disable_unit_tests: true enable_embedded_tests: native @@ -10458,6 +10459,7 @@ buildvariants: LIBS=clang_rt.builtins-arm-android LIBPATH="$(dirname $($(dirname $(pwd))/android_toolchain-arm-21/bin/clang -print-file-name=libclang_rt.builtins-arm-android.a)) \$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib" --lto + AR=$(dirname $(pwd))/android_toolchain-arm-21/bin/llvm-ar cdriver_cmake_flags: >- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DANDROID_NATIVE_API_LEVEL=21 @@ -10498,6 +10500,7 @@ buildvariants: --cxx-std=17 LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib" --lto + AR=$(dirname $(pwd))/android_toolchain-arm64-21/bin/llvm-ar cdriver_cmake_flags: >- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DANDROID_NATIVE_API_LEVEL=21 @@ -10538,6 +10541,7 @@ buildvariants: --cxx-std=17 LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib" --lto + AR=$(dirname $(pwd))/android_toolchain-x86_64-21/bin/llvm-ar cdriver_cmake_flags: >- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DANDROID_NATIVE_API_LEVEL=21 |