diff options
Diffstat (limited to 'devel/electron7/files/patch-build_toolchain_gcc__toolchain.gni')
-rw-r--r-- | devel/electron7/files/patch-build_toolchain_gcc__toolchain.gni | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/devel/electron7/files/patch-build_toolchain_gcc__toolchain.gni b/devel/electron7/files/patch-build_toolchain_gcc__toolchain.gni deleted file mode 100644 index 5c6da09e8207..000000000000 --- a/devel/electron7/files/patch-build_toolchain_gcc__toolchain.gni +++ /dev/null @@ -1,45 +0,0 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2019-12-12 12:38:59 UTC -+++ build/toolchain/gcc_toolchain.gni -@@ -36,6 +36,11 @@ if (is_linux && target_os == "android") { - enable_resource_whitelist_generation = false - } - -+declare_args() { -+ extra_cxxflags = "" -+ extra_ldflags = "" -+} -+ - # This template defines a toolchain for something that works like gcc - # (including clang). - # -@@ -589,13 +594,23 @@ template("clang_toolchain") { - } - - gcc_toolchain(target_name) { -- prefix = rebase_path("$clang_base_path/bin", root_build_dir) -- cc = "$prefix/clang" -- cxx = "$prefix/clang++" -- ld = cxx -- readelf = "${toolprefix}readelf" -- ar = "${prefix}/llvm-ar" -- nm = "${toolprefix}nm" -+ if (is_bsd) { -+ prefix = "/usr/local/bin" -+ cc = "cc" -+ cxx = "c++" -+ ld = cxx -+ readelf = "readelf" -+ ar = "${prefix}/ar" -+ nm = "${toolprefix}nm" -+ } else { -+ prefix = rebase_path("$clang_base_path/bin", root_build_dir) -+ cc = "$prefix/clang" -+ cxx = "$prefix/clang++" -+ ld = cxx -+ readelf = "${toolprefix}readelf" -+ ar = "${prefix}/llvm-ar" -+ nm = "${toolprefix}nm" -+ } - - forward_variables_from(invoker, - [ |