diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2017-12-28 16:46:47 -0500 |
|---|---|---|
| committer | Henrik Edin <henrik.edin@mongodb.com> | 2017-12-28 17:30:51 -0500 |
| commit | e7a35624783c6a2fd3892de8b7741648401d877c (patch) | |
| tree | 6308afe5e5905c76e5c8f86f2d29d394703702ff /etc/scons | |
| parent | ee3d6a0f0a2f6dd23a772786326f35bfc864f7d4 (diff) | |
| download | mongo-e7a35624783c6a2fd3892de8b7741648401d877c.tar.gz | |
SERVER-32404 Set AR for mongodbtoolchain for clang and gcc
Diffstat (limited to 'etc/scons')
| -rw-r--r-- | etc/scons/mongodbtoolchain_clang.vars | 2 | ||||
| -rw-r--r-- | etc/scons/mongodbtoolchain_gcc.vars | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/etc/scons/mongodbtoolchain_clang.vars b/etc/scons/mongodbtoolchain_clang.vars index 791a44745ca..b9896888614 100644 --- a/etc/scons/mongodbtoolchain_clang.vars +++ b/etc/scons/mongodbtoolchain_clang.vars @@ -1,6 +1,7 @@ # Configures the build to use the Clang toolchain in /opt/mongodbtoolchain/v2 import os +import subprocess import SCons.Defaults # Get the default SCons path as a list @@ -19,4 +20,5 @@ ENV = { # printed for each compiler invocation. CC = '/opt/mongodbtoolchain/v2/bin/clang' CXX = '/opt/mongodbtoolchain/v2/bin/clang++' +AR = subprocess.check_output([CXX, '-print-prog-name=ar']).strip() OBJCOPY = '/opt/mongodbtoolchain/v2/bin/objcopy' diff --git a/etc/scons/mongodbtoolchain_gcc.vars b/etc/scons/mongodbtoolchain_gcc.vars index 061665d7d69..efad8b41980 100644 --- a/etc/scons/mongodbtoolchain_gcc.vars +++ b/etc/scons/mongodbtoolchain_gcc.vars @@ -1,6 +1,7 @@ # Configures the build to use the GCC toolchain in /opt/mongodbtoolchain/v2 import os +import subprocess import SCons.Defaults # Get the default SCons path as a list @@ -19,4 +20,5 @@ ENV = { # printed for each compiler invocation. CC = '/opt/mongodbtoolchain/v2/bin/gcc' CXX = '/opt/mongodbtoolchain/v2/bin/g++' +AR = subprocess.check_output([CXX, '-print-prog-name=ar']).strip() OBJCOPY = '/opt/mongodbtoolchain/v2/bin/objcopy' |