X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf-module.mk;h=dc6a07a1c021a745a13dcb8cf42c2d23483a80a1;hb=c1aa8b6b5b870f21bc8c81da85708e9d71d4eb93;hp=8087ab9c71069bffdf637c4177d44672cdfaab78;hpb=99501797db3d77ff2a7f32071d7fab0db3fdacae;p=sbcl.git

diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index 8087ab9..dc6a07a 100644
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -7,22 +7,20 @@ 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
 
 all: $(EXTRA_ALL_TARGETS)
 	$(MAKE) -C ../asdf
-	$(SBCL) --eval '(load "../asdf/asdf")' \
-	  --eval "(setf asdf::*central-registry* '((MERGE-PATHNAMES \"systems/\" (TRUENAME (SB-EXT:POSIX-GETENV \"SBCL_HOME\")))))" \
-	  --eval "(push :sb-building-contrib *features*)" \
-	  --eval "(asdf:operate 'asdf:load-op :$(SYSTEM))" \
-	  --eval "(progn (when (probe-file \"$(SYSTEM).fasl\") (error \"fasl file exists\")) (with-open-file (s \"$(SYSTEM).lisp\" :direction :output :if-exists :error) (print (quote (require :asdf)) s) (print (quote (require :$(SYSTEM))) s)) (compile-file \"$(SYSTEM).lisp\") (delete-file \"$(SYSTEM).lisp\"))" \
-	  --eval "(quit)"
+	$(SBCL) --eval '(defvar *system* "$(SYSTEM)")' --load ../asdf-stub.lisp --eval '(quit)'
 
 test: all
 	echo "(asdf:operate (quote asdf:load-op) :$(SYSTEM))" \
@@ -31,5 +29,4 @@ test: all
 
 
 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 - )