X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf-module.mk;h=6a9aba13fa5f852a21b6e655e708022193d24670;hb=ae09f8fd7765f6cab6ad317a13e27ff22ab0c11e;hp=155988a30f3fb881496492ac7ef19bb77f1b220b;hpb=80f222325e1f677e5cf8de01c6990906fa47f65d;p=sbcl.git

diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index 155988a..6a9aba1 100644
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -7,10 +7,13 @@ CC=gcc
 # directly via ASDF from a non-C-aware module which has these tricky
 # ones as dependencies.
 
-UNAME:=$(shell uname -m)
-ifeq (x86_64,$(UNAME))
-    export EXTRA_LDFLAGS=-m32 -shared
-    export EXTRA_CFLAGS+=-m32
+UNAME:=$(shell uname -s)
+
+ifeq (SunOS,$(UNAME))
+  EXTRA_CFLAGS=-D_XOPEN_SOURCE=500 -D__EXTENSIONS__
+endif
+ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
+  EXTRA_CFLAGS=-mno-cygwin
 endif
 
 export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
@@ -24,7 +27,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 - )
-	( cd  $(BUILD_ROOT)$(SBCL_HOME)/systems && ln -fs ../$(SYSTEM)/$(SYSTEM).asd . )
+	tar cf - . | ( cd "$(BUILD_ROOT)$(INSTALL_DIR)" && tar xpvf - )
+	find "$(BUILD_ROOT)$(INSTALL_DIR)" -type f -exec chown `id -u`:`id -g` {} \;