Differential D18757 Diff 55245 www/qt5-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni
Changeset View
Changeset View
Standalone View
Standalone View
www/qt5-webengine/files/patch-src_3rdparty_chromium_build_toolchain_gcc__toolchain.gni
| --- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2017-01-26 00:49:07 UTC | --- src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni.orig 2018-11-13 18:25:11 UTC | ||||
| +++ src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni | +++ src/3rdparty/chromium/build/toolchain/gcc_toolchain.gni | ||||
| @@ -11,6 +11,11 @@ import("//build/toolchain/cc_wrapper.gni | @@ -11,6 +11,13 @@ import("//build/toolchain/clang_static_analyzer.gni") | ||||
| import("//build/toolchain/goma.gni") | import("//build/toolchain/goma.gni") | ||||
| import("//build/toolchain/toolchain.gni") | import("//build/toolchain/toolchain.gni") | ||||
| +declare_args() { | +declare_args() { | ||||
| + extra_cxxflags = "" | + extra_cxxflags = "" | ||||
| + extra_ldflags = "" | + extra_ldflags = "" | ||||
| +} | +} | ||||
| + | + | ||||
| # This template defines a toolchain for something that works like gcc | + | ||||
| # (including clang). | + | ||||
| # | if (is_nacl) { | ||||
| @@ -482,14 +487,23 @@ template("clang_toolchain") { | # To keep NaCl variables out of builds that don't include NaCl, all | ||||
| # variables defined in nacl/config.gni referenced here should be protected by | |||||
| @@ -604,13 +611,23 @@ template("clang_toolchain") { | |||||
| } | } | ||||
| gcc_toolchain(target_name) { | gcc_toolchain(target_name) { | ||||
| - prefix = rebase_path("$clang_base_path/bin", root_build_dir) | - prefix = rebase_path("$clang_base_path/bin", root_build_dir) | ||||
| - cc = "$prefix/clang" | - cc = "$prefix/clang" | ||||
| - cxx = "$prefix/clang++" | - cxx = "$prefix/clang++" | ||||
| - ld = cxx | - ld = cxx | ||||
| - readelf = "${toolprefix}readelf" | |||||
| - ar = "${prefix}/llvm-ar" | |||||
| - nm = "${toolprefix}nm" | |||||
| + if (is_bsd) { | + if (is_bsd) { | ||||
| + cc = "${toolprefix}clang" | + cc = "${toolprefix}clang" | ||||
| + cxx = "${toolprefix}clang++" | + cxx = "${toolprefix}clang++" | ||||
| + ld = cxx | + ld = cxx | ||||
| + readelf = "readelf" | + readelf = "readelf" | ||||
| + ar = "${toolprefix}ar" | + ar = "${toolprefix}ar" | ||||
| + nm = "${toolprefix}nm" | + nm = "${toolprefix}nm" | ||||
| + } else { | + } else { | ||||
| + prefix = rebase_path("$clang_base_path/bin", root_build_dir) | + prefix = rebase_path("$clang_base_path/bin", root_build_dir) | ||||
| + cc = "$prefix/clang" | + cc = "$prefix/clang" | ||||
| + cxx = "$prefix/clang++" | + cxx = "$prefix/clang++" | ||||
| + ld = cxx | + ld = cxx | ||||
| + | |||||
| - readelf = "${toolprefix}readelf" | |||||
| - ar = "${toolprefix}ar" | |||||
| - nm = "${toolprefix}nm" | |||||
| + readelf = "${toolprefix}readelf" | + readelf = "${toolprefix}readelf" | ||||
| + ar = "${toolprefix}ar" | + ar = "${prefix}/llvm-ar" | ||||
| + nm = "${toolprefix}nm" | + nm = "${toolprefix}nm" | ||||
| + } | + } | ||||
| forward_variables_from(invoker, [ "strip" ]) | forward_variables_from(invoker, | ||||
| [ | |||||