From 84e4a80b017d8913f5a8445d2ff0bfd58879985e Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@nbp.name>
Date: Tue, 23 Jul 2019 18:13:32 +0200
Subject: [PATCH] Gecko: Use stdenv's clang for clang paths.

---
 pkgs/gecko/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/gecko/default.nix b/pkgs/gecko/default.nix
index a9479d2..869bc8f 100644
--- a/pkgs/gecko/default.nix
+++ b/pkgs/gecko/default.nix
@@ -109,14 +109,23 @@ let
     (if stdenv.isAarch64 then null else rr)
   ];
 
+  # bindgen.configure now has a rule to check that with-libclang-path matches CC
+  # or CXX. Default to the stdenv compiler if we are compiling with clang.
+  clang_path =
+    if stdenv.cc.isGNU then "${llvmPackages.clang}/bin/clang"
+    else "${stdenv.cc}/bin/cc";
+  libclang_path =
+    if stdenv.cc.isGNU then "${llvmPackages.clang.cc.lib}/lib"
+    else "${stdenv.cc.cc.lib}/lib";
+
   genMozConfig = ''
     cxxLib=$( echo -n ${gcc}/include/c++/* )
     archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )
 
     cat - > $MOZCONFIG <<EOF
     mk_add_options AUTOCONF=${autoconf213}/bin/autoconf
-    ac_add_options --with-libclang-path=${llvmPackages.clang.cc.lib}/lib
-    ac_add_options --with-clang-path=${llvmPackages.clang}/bin/clang
+    ac_add_options --with-libclang-path=${libclang_path}/lib
+    ac_add_options --with-clang-path=${clang_path}
     export BINDGEN_CFLAGS="-cxx-isystem $cxxLib -isystem $archLib"
     export CC="${stdenv.cc}/bin/cc"
     export CXX="${stdenv.cc}/bin/c++"
@@ -129,7 +138,7 @@ let
     export CC="${stdenv.cc}/bin/cc";
     export CXX="${stdenv.cc}/bin/c++";
     # To be used when building the JS Shell.
-    export NIX_EXTRA_CONFIGURE_ARGS="--with-libclang-path=${llvmPackages.clang.cc.lib}/lib --with-clang-path=${llvmPackages.clang}/bin/clang"
+    export NIX_EXTRA_CONFIGURE_ARGS="--with-libclang-path=${libclang_path}/lib --with-clang-path=${clang_path}"
     cxxLib=$( echo -n ${gcc}/include/c++/* )
     archLib=$cxxLib/$( ${gcc}/bin/gcc -dumpmachine )
     export BINDGEN_CFLAGS="-cxx-isystem $cxxLib -isystem $archLib"