diff options
Diffstat (limited to 'deb_patches/build-with-libstdc++-7.patch')
| -rw-r--r-- | deb_patches/build-with-libstdc++-7.patch | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/deb_patches/build-with-libstdc++-7.patch b/deb_patches/build-with-libstdc++-7.patch index 82cf9cc..fbd1531 100644 --- a/deb_patches/build-with-libstdc++-7.patch +++ b/deb_patches/build-with-libstdc++-7.patch @@ -5,29 +5,29 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861 --- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1252,6 +1252,7 @@ try_compile(includes=['cstddef'], - '# endif', - '#endif', - ]), -+ flags=['--gcc-toolchain=/usr/lib/gcc-mozilla'], - check_msg='for new enough STL headers from libstdc++', - when=needs_libstdcxx_newness_check, - onerror=die_on_old_libstdcxx) + "#endif", + ] + ), ++ flags=["--gcc-toolchain=/usr/lib/gcc-mozilla"], + 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 - set_config('_HOST_DEPEND_CFLAGS', depend_cflags(host_c_compiler)) + set_config("_HOST_DEPEND_CFLAGS", depend_cflags(host_c_compiler)) -+add_old_configure_assignment('CFLAGS', ['--gcc-toolchain=/usr/lib/gcc-mozilla']) -+add_old_configure_assignment('CXXFLAGS', ['--gcc-toolchain=/usr/lib/gcc-mozilla']) ++add_old_configure_assignment("CFLAGS", ["--gcc-toolchain=/usr/lib/gcc-mozilla"]) ++add_old_configure_assignment("CXXFLAGS", ["--gcc-toolchain=/usr/lib/gcc-mozilla"]) + + @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 - flags.append('-Wl,--sysroot=%s' % macos_sdk) - elif host.cpu == 'arm': - flags.append('-Wl,--no-keep-memory') -+ flags.append('-static-libstdc++') + flags.append("-Wl,--sysroot=%s" % macos_sdk) + elif host.cpu == "arm": + flags.append("-Wl,--no-keep-memory") ++ flags.append("-static-libstdc++") return flags @@ -45,10 +45,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/1856861 --- 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'] + "host_ListCSSProperties", + ] + ) ++HOST_CXXFLAGS += ["--gcc-toolchain=/usr/lib/gcc-mozilla"] MOCHITEST_MANIFESTS += [ - 'mochitest.ini', + "mochitest.ini", |