diff options
| author | Gabriel Russell <gabriel.russell@mongodb.com> | 2018-06-19 13:34:37 -0400 |
|---|---|---|
| committer | Gabriel Russell <gabriel.russell@mongodb.com> | 2018-06-21 16:32:08 +0000 |
| commit | c75daff3db444c018400fa22a80af2d149292521 (patch) | |
| tree | cf12a2795f3651dd90d427b7f88efbdaa3c761f3 /SConstruct | |
| parent | 9df6cbae9c20bdce759deb806e5175b7fc83d007 (diff) | |
| download | mongo-c75daff3db444c018400fa22a80af2d149292521.tar.gz | |
SERVER-35664 run android tests on version 24 images
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 9bbe81aca80..c840aaa2480 100644 --- a/SConstruct +++ b/SConstruct @@ -2607,8 +2607,13 @@ def doConfigure(myenv): # Explicitly enable GNU build id's if the linker supports it. AddToLINKFLAGSIfSupported(myenv, '-Wl,--build-id') - # Explicitly use the new gnu hash section if the linker offers it. - AddToLINKFLAGSIfSupported(myenv, '-Wl,--hash-style=gnu') + # Explicitly use the new gnu hash section if the linker offers + # it, except on android since older runtimes seem to not + # support it. For that platform, use 'both'. + if env.TargetOSIs('android'): + AddToLINKFLAGSIfSupported(myenv, '-Wl,--hash-style=both') + else: + AddToLINKFLAGSIfSupported(myenv, '-Wl,--hash-style=gnu') # Try to have the linker tell us about ODR violations. Don't # use it when using clang with libstdc++, as libstdc++ was |