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

diff --git a/contrib/asdf-module.mk b/contrib/asdf-module.mk
index c646b9d..8087ab9 100644
--- a/contrib/asdf-module.mk
+++ b/contrib/asdf-module.mk
@@ -1,29 +1,19 @@
 CC=gcc
 
-# Need to set CFLAGS and LDFLAGS here. sb-posix, sb-grovel, and
-# sb-bsd-sockets depends upon these being set on x86_64. Setting these
-# in their Makefile's is not adequate since their asd files are
-# invoked when loaded from other modules which don't require these
-# environmental values in their Makefile's.
+# 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 CFLAGS=-fPIC
-ifeq (solaris,$(UNAME))
-  export LDFLAGS=-shared -lresolv -lsocket -lnsl
-else
-  ifeq (Darwin,$(UNAME))
-    export LDFLAGS=-bundle
-  else
-    ifeq (x86_64,$(UNAME))
-      export LDFLAGS=-m32 -shared
-      export CFLAGS+= -m32
-    else
-      export LDFLAGS=-shared
-    endif
-  endif
+ifeq (x86_64,$(UNAME))
+    export EXTRA_LDFLAGS=-m32 -shared
+    export EXTRA_CFLAGS+=-m32
 endif
 
-export CC SBCL CFLAGS LDFLAGS
+export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS
 
 all: $(EXTRA_ALL_TARGETS)
 	$(MAKE) -C ../asdf