X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf-module.mk;h=86d369876f47a251fddb130adcc1884b56f7e380;hb=96eea51e453a0033d1c24f32aa81176bceea4ba2;hp=32626dc9d5f454c99e529801c0688012db7cb063;hpb=df79c4884cd4442b0a2d8ce2478b0fcea64cbe8d;p=sbcl.git

diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index 32626dc..86d3698 100644
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -1,13 +1,19 @@
 CC=gcc
-export CC SBCL
+
+# 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)
+
+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 "(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))" \
@@ -17,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 . )