diff options
| author | Brent Gardner <bgardner@squarelabs.net> | 2020-09-19 22:42:27 +0000 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-09-21 18:54:33 +0000 |
| commit | 761c50c69014f92ffb1af44f4a1e4220c04ac32e (patch) | |
| tree | 37bdc5dceadfd151f7d1abac3d8bc22c3b45cec5 /config | |
| parent | 48ef372412edfdd9c7fd34f5fdfaf8831791712f (diff) | |
Don't override the 64 bit linker with the 32 bit one
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/607>
Diffstat (limited to 'config')
| -rw-r--r-- | config/android.config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/android.config b/config/android.config index ddcc1f19..abd8aa4d 100644 --- a/config/android.config +++ b/config/android.config @@ -143,7 +143,7 @@ if target_arch == Architecture.X86: if v < 24: cflags += ' -mstackrealign' -ldflags = '-gcc-toolchain %s -fPIC -no-canonical-prefixes -Wl,-no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--gc-sections -Wl,-dynamic-linker,/system/bin/linker -Wl,--warn-shared-textrel -Wl,--exclude-libs,libatomic.a -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libgcc_real.a -Wl,--exclude-libs,libunwind.a' % (gcc_toolchain_root,) +ldflags = '-gcc-toolchain %s -fPIC -no-canonical-prefixes -Wl,-no-undefined -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--gc-sections -Wl,--warn-shared-textrel -Wl,--exclude-libs,libatomic.a -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libgcc_real.a -Wl,--exclude-libs,libunwind.a' % (gcc_toolchain_root,) if target_arch == Architecture.ARMv7: defines += ' -D__ARM_ARCH_7A__ ' |