diff options
| -rw-r--r-- | etc/evergreen.yml | 3 | ||||
| -rw-r--r-- | etc/scons/android_toolchain.vars | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index aa49bbc9383..2b1c2703341 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -10333,6 +10333,7 @@ buildvariants: -j$(grep -c ^processor /proc/cpuinfo) --android-toolchain-path=$(dirname $(pwd))/android_toolchain-arm-21 --variables-files=etc/scons/android_toolchain.vars + --cxx-std=17 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" cdriver_cmake_flags: >- @@ -10370,6 +10371,7 @@ buildvariants: -j$(grep -c ^processor /proc/cpuinfo) --android-toolchain-path=$(dirname $(pwd))/android_toolchain-arm64-21 --variables-files=etc/scons/android_toolchain.vars + --cxx-std=17 LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib" cdriver_cmake_flags: >- -DCMAKE_BUILD_TYPE=RelWithDebInfo @@ -10406,6 +10408,7 @@ buildvariants: -j$(grep -c ^processor /proc/cpuinfo) --android-toolchain-path=$(dirname $(pwd))/android_toolchain-x86_64-21 --variables-files=etc/scons/android_toolchain.vars + --cxx-std=17 LIBPATH="\$BUILD_ROOT/mongo-embedded-sdk-\$MONGO_VERSION/lib" cdriver_cmake_flags: >- -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/etc/scons/android_toolchain.vars b/etc/scons/android_toolchain.vars index cd1b00159a0..973e4e36468 100644 --- a/etc/scons/android_toolchain.vars +++ b/etc/scons/android_toolchain.vars @@ -20,7 +20,7 @@ CXX=os.path.join(toolchain_path, "bin", "clang++" + compiler_suffix) AR=subprocess.check_output([CXX, '-print-prog-name=ar']).strip() LINKFLAGS='-static-libstdc++' -CPPDEFINES='__ANDROID_API__=21' +CPPDEFINES='__ANDROID_API__=21 _LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR' TARGET_OS="android" TOOLS="gcc g++ gnulink ar gas" |