$OpenBSD: patch-build_toolchain_gcc_toolchain_gni,v 1.11 2019/04/17 11:48:53 robert Exp $
Index: build/toolchain/gcc_toolchain.gni
--- build/toolchain/gcc_toolchain.gni.orig
+++ build/toolchain/gcc_toolchain.gni
@@ -47,6 +47,11 @@ analyzer_wrapper =
     rebase_path("//build/toolchain/clang_static_analyzer_wrapper.py",
                 root_build_dir) + " --mode=clang"
 
+declare_args() {
+  extra_cppflags = ""
+  extra_ldflags = ""
+}
+
 # This template defines a toolchain for something that works like gcc
 # (including clang).
 #
@@ -610,12 +615,12 @@ template("clang_toolchain") {
   }
 
   gcc_toolchain(target_name) {
-    prefix = rebase_path("$clang_base_path/bin", root_build_dir)
-    cc = "$prefix/clang"
-    cxx = "$prefix/clang++"
+    prefix = "/usr/bin"
+    cc = "cc"
+    cxx = "c++"
     ld = cxx
     readelf = "${toolprefix}readelf"
-    ar = "${prefix}/llvm-ar"
+    ar = "${prefix}/ar"
     nm = "${toolprefix}nm"
 
     forward_variables_from(invoker,
