From: Stas Boukarev <stassats@gmail.com>
Date: Sat, 28 Jul 2012 15:15:57 +0000 (+0000)
Subject: Fix build of contribs on Windows.
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=b75bc9ddf359ae9dcf25faf2f60f35aeb488e853;p=sbcl.git

Fix build of contribs on Windows.

Set CC variable in make-target-contrib.sh, not in asdf-module.mk, Make
defaults CC to "cc" making it impossible to conditionally set CC to gcc
if it's unset.
---

diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index ddce36b..3f88bdb 100644
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -1,4 +1,3 @@
-CC?=gcc
 
 # We need to extend flags to the C compiler and the linker
 # here. sb-posix, sb-grovel, and sb-bsd-sockets depends upon these
diff --git a/make-target-contrib.sh b/make-target-contrib.sh
index 22fe7e5..c171111 100644
--- a/make-target-contrib.sh
+++ b/make-target-contrib.sh
@@ -18,7 +18,8 @@ echo //entering make-target-contrib.sh
 
 LANG=C
 LC_ALL=C
-export LANG LC_ALL
+CC=${CC:-gcc}
+export CC LANG LC_ALL
 
 # Load our build configuration
 . output/build-config