X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf-module.mk;h=873606bcaa3d820bf18e7a5557f139ee90af8f79;hb=512c78f5f0c8e4c11bad219313dd83890f625006;hp=e858a205606044e7c745fabbea5b822df25f4eaf;hpb=7275aafca8c682f874161d92aa07662a53f056b7;p=sbcl.git

diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index e858a20..873606b 100644
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -1,4 +1,4 @@
-CC=gcc
+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
@@ -11,9 +11,16 @@ UNAME:=$(shell uname -s)
 
 ifeq (SunOS,$(UNAME))
   EXTRA_CFLAGS=-D_XOPEN_SOURCE=500 -D__EXTENSIONS__
+  PATH:=/usr/xpg4/bin:${PATH}
 endif
 ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
   EXTRA_CFLAGS=-mno-cygwin
+  # GCC 4.x doesn't accept -mno-cygwin.
+  CC:=gcc-3
+  # SBCL can't read cygwin symlinks, and cygwin likes to symlink
+  # gcc.  To further complicate things, SBCL can't handle cygwin
+  # paths, either.
+  CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
 endif
 
 export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
@@ -27,6 +34,8 @@ test: all
 	     "(asdf:operate (quote asdf:test-op) :$(SYSTEM))" | \
 	  $(SBCL) --eval '(load "../asdf/asdf")'
 
-
+# KLUDGE: There seems to be no portable way to tell tar to not to
+# preserve owner, so chown after installing for the current user.
 install: $(EXTRA_INSTALL_TARGETS)
-	tar cf - . | ( cd $(BUILD_ROOT)$(INSTALL_DIR) && tar xpvf - )
+	tar cf - . | ( cd "$(BUILD_ROOT)$(INSTALL_DIR)" && tar xpvf - )
+	find "$(BUILD_ROOT)$(INSTALL_DIR)" -exec chown `id -u`:`id -g` {} \;