0.9.11.7

[sbcl.git] / contrib / asdf-module.mk

diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index 8087ab9..86d3698 100644 (file)
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -8,21 +8,12 @@ CC=gcc
 # ones as dependencies.
 
 UNAME:=$(shell uname -m)
-ifeq (x86_64,$(UNAME))
-    export EXTRA_LDFLAGS=-m32 -shared
-    export EXTRA_CFLAGS+=-m32
-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))" \
@@ -32,4 +23,3 @@ 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 . )