X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf-module.mk;h=8087ab9c71069bffdf637c4177d44672cdfaab78;hb=2f1071f50ae43bce938aacf03d67d9626014a076;hp=6179c56858af6f392dfb591642e72bacff420178;hpb=93c941d86b264637de20aa1b713757b704d4c1a6;p=sbcl.git

diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index 6179c56..8087ab9 100644
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -1,17 +1,35 @@
 CC=gcc
-export CC
 
-all: 
+# We need to extend flags to the C compiler and the linker
+# here. sb-posix, sb-grovel, and sb-bsd-sockets depends upon these
+# being set on x86_64. Setting these in their Makefiles is not
+# adequate since, while we're building contrib, they can be compiled
+# 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
+endif
+
+export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
+
+all: $(EXTRA_ALL_TARGETS)
 	$(MAKE) -C ../asdf
-	echo "(asdf:operate 'asdf:load-op :$(SYSTEM) :force t)" | \
-	  $(SBCL) --eval '(load "../asdf/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)"
 
 test: all
-	echo "(asdf:operate (quote asdf:load-op) :$(SYSTEM)) "\
+	echo "(asdf:operate (quote asdf:load-op) :$(SYSTEM))" \
 	     "(asdf:operate (quote asdf:test-op) :$(SYSTEM))" | \
 	  $(SBCL) --eval '(load "../asdf/asdf")'
 
 
-install:
-	tar cf - . | ( cd $(INSTALL_DIR) && tar xpvf - )
-	( cd  $(SBCL_HOME)/systems && ln -fs ../$(SYSTEM)/$(SYSTEM).asd . )
+install: $(EXTRA_INSTALL_TARGETS)
+	tar cf - . | ( cd $(BUILD_ROOT)$(INSTALL_DIR) && tar xpvf - )
+	( cd  $(BUILD_ROOT)$(SBCL_HOME)/systems && ln -fs ../$(SYSTEM)/$(SYSTEM).asd . )