diff options
| author | Matthew Waters <matthew@centricular.com> | 2023-05-31 11:13:24 +1000 |
|---|---|---|
| committer | Matthew Waters <matthew@centricular.com> | 2023-06-04 13:42:51 +1000 |
| commit | 1cf026d1d7852485442eb76d2402586d753f8417 (patch) | |
| tree | c703e5740b54f277c44631a5b7c91b61a885e0b7 /config | |
| parent | 976ca291952c026df38a49dcec945ba05b9d04db (diff) | |
android: remove all traces of gnustl
The relevant c++ standard library is now automaticaly added by the
compiler/linker and our gross hack involving gnustl.pc/la is not longer
needed.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1191>
Diffstat (limited to 'config')
| -rw-r--r-- | config/android.config | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/config/android.config b/config/android.config index ff14bd42..5b24585f 100644 --- a/config/android.config +++ b/config/android.config @@ -152,24 +152,16 @@ if not target_arch in [Architecture.ARM64, Architecture.X86_64]: # nocopyreloc causes broken linking on arm64 ldflags += ' -Wl,-z,nocopyreloc ' -# this C++ stl setup is closely tied to the gnustl recipe which sets up the -# necessary environment and files for this -stl_prefix = os.path.join(toolchain_prefix, 'sources', 'cxx-stl', 'llvm-libc++') -stl_libdir = os.path.join(toolchain_prefix, 'libs', _cxx_arch) - ldflags += f' -L{sysroot}/usr/lib/{host}/{v} ' -stl_cxxlinkargs = ['-nostdlib++', '-L' + stl_libdir, '-lc++_shared'] -stl_cxxflags = '-nostdlib++ -isystem ' + os.path.join (stl_prefix, 'include') + ' -isystem ' + os.path.join (stl_prefix, '..', 'llvm-libc++abi', 'include') - ldvariant = 'lld' ldflags += f' -fuse-ld={ldvariant} ' # Toolchain environment env['CPPFLAGS'] = defines env['CFLAGS'] += f'{cflags} {defines} -Wa,--noexecstack' -env['CXXFLAGS'] = stl_cxxflags + ' ' + env['CFLAGS'] + ' -fno-rtti -fno-exceptions ' -env['LDFLAGS'] = ldflags + ' -nostdlib++' +env['CXXFLAGS'] = env['CFLAGS'] + ' -fno-rtti -fno-exceptions ' +env['LDFLAGS'] = ldflags def llvm_cmd(command): return os.path.join(llvm_toolchain_path, command) @@ -221,5 +213,3 @@ if v < 24: meson_properties['has_function_ftello64'] = 'false' meson_properties['has_function_fsetpos64'] = 'false' meson_properties['has_function_fgetpos64'] = 'false' - -meson_properties['cpp_link_args'] = stl_cxxlinkargs |