diff options
Diffstat (limited to 'www/chromium/files/patch-build_toolchain_gcc__toolchain.gni')
| -rw-r--r-- | www/chromium/files/patch-build_toolchain_gcc__toolchain.gni | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni index 5fc7d6d58dc3..1613bd73a406 100644 --- a/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/chromium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2021-04-14 18:40:48 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2021-06-09 22:13:52 UTC +++ build/toolchain/gcc_toolchain.gni @@ -51,6 +51,11 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -12,7 +12,20 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -646,13 +651,23 @@ template("clang_toolchain") { +@@ -647,20 +652,32 @@ template("gcc_toolchain") { + # actually just be doing a native compile. The invoker can optionally override + # use_gold too. + template("clang_toolchain") { +- if (defined(invoker.toolprefix)) { +- toolprefix = invoker.toolprefix +- } else { +- toolprefix = "" ++ if (!is_bsd) { ++ if (defined(invoker.toolprefix)) { ++ toolprefix = invoker.toolprefix ++ } else { ++ toolprefix = "" ++ } } gcc_toolchain(target_name) { @@ -22,7 +35,7 @@ - ld = cxx - readelf = "${toolprefix}readelf" - ar = "${prefix}/llvm-ar" -- nm = "${toolprefix}nm" +- nm = "${prefix}/llvm-nm" + if (is_bsd) { + prefix = "/usr/local/bin" + cc = "cc" @@ -30,7 +43,7 @@ + ld = cxx + readelf = "readelf" + ar = "${prefix}/ar" -+ nm = "${toolprefix}nm" ++ nm = "${prefix}/nm" + } else { + prefix = rebase_path("$clang_base_path/bin", root_build_dir) + cc = "$prefix/clang" @@ -38,7 +51,7 @@ + ld = cxx + readelf = "${toolprefix}readelf" + ar = "${prefix}/llvm-ar" -+ nm = "${toolprefix}nm" ++ nm = "${prefix}/llvm-nm" + } forward_variables_from(invoker, |