diff options
| author | Andrew Morrow <acm@mongodb.com> | 2018-03-19 13:06:42 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2018-03-21 17:15:42 -0400 |
| commit | aeeb0fcfd4e6aedded7961d18794448ef880df49 (patch) | |
| tree | bc7e93c6c838f53160b07890d7e532cc62f89207 /SConstruct | |
| parent | 71312d6271d0a6be630908b4ac3455c16a3fb9aa (diff) | |
| download | mongo-aeeb0fcfd4e6aedded7961d18794448ef880df49.tar.gz | |
SERVER-33914 Provide embedded SDK download links
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index fcd14983ed4..9f621cd5856 100644 --- a/SConstruct +++ b/SConstruct @@ -3161,7 +3161,11 @@ if get_option('install-mode') == 'hygienic': env.Literal('\\$$ORIGIN/../lib') ], LINKFLAGS=[ - '-Wl,-z,origin', + # Most systems *require* -z,origin to make origin work, but android + # blows up at runtime if it finds DF_ORIGIN_1 in DT_FLAGS_1. + # https://android.googlesource.com/platform/bionic/+/cbc80ba9d839675a0c4891e2ab33f39ba51b04b2/linker/linker.h#68 + # https://android.googlesource.com/platform/bionic/+/cbc80ba9d839675a0c4891e2ab33f39ba51b04b2/libc/include/elf.h#215 + '-Wl,-z,origin' if not env.TargetOSIs('android') else [], '-Wl,--enable-new-dtags', ], SHLINKFLAGS=[ |