X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fasdf-module.mk;h=dba81ea337b4da97aecd8ccec2547da20d35a654;hb=695bb17f0b3c5ae1680115f7c59ed625c2877084;hp=9c98ea425c609096d8576ae998437d6120058ac5;hpb=44dbdff97fbcc1e5b12e1330da92c5a3dcb94a3b;p=sbcl.git

diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index 9c98ea4..dba81ea 100644
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -1,19 +1,44 @@
-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 -s)
+
+ifeq (SunOS,$(UNAME))
+  EXTRA_CFLAGS=-D_XOPEN_SOURCE=500 -D__EXTENSIONS__
+  PATH:=/usr/xpg4/bin:${PATH}
+endif
+ifeq (CYGWIN,$(findstring CYGWIN,$(UNAME)))
+  EXTRA_CFLAGS=-mno-cygwin
+  # GCC 4.x doesn't accept -mno-cygwin.
+  CC:=gcc-3
+  # SBCL can't read cygwin symlinks, and cygwin likes to symlink
+  # gcc.  To further complicate things, SBCL can't handle cygwin
+  # paths, either.
+  CC:=$(shell cygpath -m $(shell readlink -fn $(shell which $(CC))))
+endif
+ifeq (Linux,$(UNAME))
+  EXTRA_CFLAGS=-D_GNU_SOURCE
+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 "(asdf:operate 'asdf:load-op :$(SYSTEM))" \
-	  --eval "(quit)"
+	$(SBCL) --eval '(defvar *system* "$(SYSTEM)")' --load ../asdf-stub.lisp --eval '(exit)'
 
 test: all
-	echo "(asdf:operate (quote asdf:load-op) :$(SYSTEM))" \
+	echo "(pushnew :sb-testing-contrib *features*)" \
+	     "(asdf:operate (quote asdf:load-op) :$(SYSTEM))" \
 	     "(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)" -exec chown `id -u`:`id -g` {} \;