From 26b4c8f71f91d22e081b27814782686edde0c90a Mon Sep 17 00:00:00 2001
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Fri, 1 Jan 2021 10:11:34 +0000
Subject: Revert r559792 to unbreak INDEX and bulk -a It seems a lot of reverse
 dependencies were missed

With hat:	portmgr
---
 .../files/patch-build_toolchain_gcc__toolchain.gni | 45 ++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 devel/electron6/files/patch-build_toolchain_gcc__toolchain.gni

(limited to 'devel/electron6/files/patch-build_toolchain_gcc__toolchain.gni')

diff --git a/devel/electron6/files/patch-build_toolchain_gcc__toolchain.gni b/devel/electron6/files/patch-build_toolchain_gcc__toolchain.gni
new file mode 100644
index 000000000000..de9f6ffbe48b
--- /dev/null
+++ b/devel/electron6/files/patch-build_toolchain_gcc__toolchain.gni
@@ -0,0 +1,45 @@
+--- build/toolchain/gcc_toolchain.gni.orig	2019-09-10 11:13:32 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).
+ #
+@@ -617,13 +622,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,
+                            [
-- 
cgit v1.2.3