diff options
| -rw-r--r-- | deb_patches/build-with-libstdc++-7.patch | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/deb_patches/build-with-libstdc++-7.patch b/deb_patches/build-with-libstdc++-7.patch index 82cf9cc..55d0036 100644 --- a/deb_patches/build-with-libstdc++-7.patch +++ b/deb_patches/build-with-libstdc++-7.patch @@ -1,7 +1,5 @@ -Description: point clang to the toolchain provided by the gcc-mozilla package (version 7 required for C++ 17), and statically link against libstdc++ -Author: Olivier Tilloy <olivier.tilloy@canonical.com> -Bug-Ubuntu: https://launchpad.net/bugs/1856861 - +diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure +index ce42ab7..b07514f 100755 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1252,6 +1252,7 @@ try_compile(includes=['cstddef'], @@ -12,7 +10,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861 check_msg='for new enough STL headers from libstdc++', when=needs_libstdcxx_newness_check, onerror=die_on_old_libstdcxx) -@@ -1433,6 +1434,10 @@ set_config('_DEPEND_CFLAGS', depend_cfla +@@ -1433,6 +1434,10 @@ set_config('_DEPEND_CFLAGS', depend_cflags(c_compiler)) set_config('_HOST_DEPEND_CFLAGS', depend_cflags(host_c_compiler)) @@ -23,14 +21,29 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861 @depends(c_compiler) def preprocess_option(compiler): # The uses of PREPROCESS_OPTION depend on the spacing for -o/-Fi. -@@ -2137,6 +2142,7 @@ def linker_ldflags(linker, macos_sdk, ho +@@ -2133,7 +2138,7 @@ def linker_ldflags(linker, macos_sdk): + flags.append('-Wl,-syslibroot,%s' % macos_sdk) + else: flags.append('-Wl,--sysroot=%s' % macos_sdk) - elif host.cpu == 'arm': - flags.append('-Wl,--no-keep-memory') +- + flags.append('-static-libstdc++') return flags +diff --git a/layout/style/test/moz.build b/layout/style/test/moz.build +index 5b77bd8..3b8f869 100644 +--- a/layout/style/test/moz.build ++++ b/layout/style/test/moz.build +@@ -18,6 +18,7 @@ DIRS += ['gtest'] + HostSimplePrograms([ + 'host_ListCSSProperties', + ]) ++HOST_CXXFLAGS += ['--gcc-toolchain=/usr/lib/gcc-mozilla'] + + MOCHITEST_MANIFESTS += [ + 'mochitest.ini', +diff --git a/servo/components/style/build_gecko.rs b/servo/components/style/build_gecko.rs +index dfd2a21..5696e2a 100644 --- a/servo/components/style/build_gecko.rs +++ b/servo/components/style/build_gecko.rs @@ -149,6 +149,8 @@ impl BuilderExt for Builder { @@ -42,13 +55,3 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861 for dir in SEARCH_PATHS.iter() { builder = builder.clang_arg("-I").clang_arg(dir.to_str().unwrap()); } ---- a/layout/style/test/moz.build -+++ b/layout/style/test/moz.build -@@ -18,6 +18,7 @@ DIRS += ['gtest'] - HostSimplePrograms([ - 'host_ListCSSProperties', - ]) -+HOST_CXXFLAGS += ['--gcc-toolchain=/usr/lib/gcc-mozilla'] - - MOCHITEST_MANIFESTS += [ - 'mochitest.ini', |