about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNicolas B. Pierron <nicolas.b.pierron@nbp.name>2018-10-08 18:51:29 +0200
committerNicolas B. Pierron <nicolas.b.pierron@gmail.com>2018-10-08 18:54:05 +0200
commitc72ff151a3e25f14182569679ed4cd22ef352328 (patch)
tree6a9e3ac3cb5831fc73315e5ca51c1bf4a72c13fa
parenta7159e93ca1374dfae8389dfc6d966fb37b50903 (diff)
downloadnixlib-c72ff151a3e25f14182569679ed4cd22ef352328.tar
nixlib-c72ff151a3e25f14182569679ed4cd22ef352328.tar.gz
nixlib-c72ff151a3e25f14182569679ed4cd22ef352328.tar.bz2
nixlib-c72ff151a3e25f14182569679ed4cd22ef352328.tar.lz
nixlib-c72ff151a3e25f14182569679ed4cd22ef352328.tar.xz
nixlib-c72ff151a3e25f14182569679ed4cd22ef352328.tar.zst
nixlib-c72ff151a3e25f14182569679ed4cd22ef352328.zip
Bug 1397263 causes build failures when AS=as is set.
-rw-r--r--pkgs/gecko/default.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/gecko/default.nix b/pkgs/gecko/default.nix
index 0fa3ac8ece7a..610a7a371340 100644
--- a/pkgs/gecko/default.nix
+++ b/pkgs/gecko/default.nix
@@ -120,6 +120,7 @@ let
     export BINDGEN_CFLAGS="-cxx-isystem $cxxLib -isystem $archLib"
     ${genMozConfig}
     ${builtins.getEnv "NIX_SHELL_HOOK"}
+    unset AS
   '';
 
   # propagatedBuildInput should already have applied the "lib.chooseDevOutputs"
@@ -151,6 +152,7 @@ stdenv.mkDerivation {
   tracePhases = true;
 
   configurePhase = ''
+    unset AS; # Set to CC when configured.
     export MOZBUILD_STATE_PATH=$(pwd)/.mozbuild
     export MOZCONFIG=$(pwd)/.mozconfig
     export builddir=$(pwd)/builddir