[Sbcl-commits] CVS: sbcl/src/runtime Config.ppc-darwin, 1.14, 1.15 Config.ppc-linux, 1.7, 1.8 Config.x86-freebsd, 1.5, 1.6 Config.x86-linux, 1.14, 1.15 Config.x86_64-linux, 1.5, 1.6 GNUmakefile, 1.27, 1.28

[Juho S. <js...@us...>]

Update of /cvsroot/sbcl/sbcl/src/runtime
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv11026/src/runtime

Modified Files:
	Config.ppc-darwin Config.ppc-linux Config.x86-freebsd 
	Config.x86-linux Config.x86_64-linux GNUmakefile 
Log Message:
0.9.18.49:
        Fix Linux/x86 build after a clean.sh.

        * Write the target features to genesis/Makefile.features, included
          into other makefiles.
        * Remove the disgusting shell/grep tricks for feature-based 
          conditionalizing in Makefiles


Index: Config.ppc-darwin
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/Config.ppc-darwin,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Config.ppc-darwin	2 Nov 2006 15:35:13 -0000	1.14
+++ Config.ppc-darwin	13 Nov 2006 16:03:30 -0000	1.15
@@ -20,10 +20,11 @@
 
 CPPFLAGS += -no-cpp-precomp
 
-GC_SRC = $(shell if grep LISP_FEATURE_GENCGC genesis/config.h \
-                      > /dev/null 2>&1; \
-                   then echo "gencgc.c"; \
-                   else echo "cheneygc.c" ; fi)
+ifdef LISP_FEATURE_GENCGC
+  GC_SRC = "gencgc.c"
+else
+  GC_SRC = "cheneygc.c"
+endif
 
 .PHONY: after-grovel-headers
 

Index: Config.ppc-linux
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/Config.ppc-linux,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Config.ppc-linux	21 Feb 2006 22:59:32 -0000	1.7
+++ Config.ppc-linux	13 Nov 2006 16:03:31 -0000	1.8
@@ -19,10 +19,11 @@
 OS_SRC = linux-os.c ppc-linux-os.c
 OS_LIBS = -ldl
 
-GC_SRC = $(shell if grep LISP_FEATURE_GENCGC genesis/config.h \
-                      > /dev/null 2>&1; \
-                   then echo "gencgc.c"; \
-                   else echo "cheneygc.c" ; fi)
+ifdef LISP_FEATURE_GENCGC
+  GC_SRC = "gencgc.c"
+else
+  GC_SRC = "cheneygc.c"
+endif
 
 # Nothing to do for after-grovel-headers.
 .PHONY: after-grovel-headers

Index: Config.x86-freebsd
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/Config.x86-freebsd,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Config.x86-freebsd	3 Jun 2006 20:26:52 -0000	1.5
+++ Config.x86-freebsd	13 Nov 2006 16:03:31 -0000	1.6
@@ -18,6 +18,7 @@
 # dlopen() etc., which in turn depend on dynamic linking of the
 # runtime.
 LINKFLAGS += -dynamic -export-dynamic
-LINKFLAGS += $(shell if grep LISP_FEATURE_SB_THREAD genesis/config.h \
-                      > /dev/null 2>&1; \
-                   then echo "-lpthread"; fi)
+
+ifdef LISP_FEATURE_SB_THREAD
+  OS_LIBS += -lpthread
+endif

Index: Config.x86-linux
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/Config.x86-linux,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Config.x86-linux	12 Nov 2006 23:04:59 -0000	1.14
+++ Config.x86-linux	13 Nov 2006 16:03:31 -0000	1.15
@@ -30,14 +30,13 @@
 LINKFLAGS += -Wl,--export-dynamic
 OS_LIBS = -ldl
 
-CFLAGS += $(shell if grep LISP_FEATURE_LARGEFILE genesis/config.h \
-                      > /dev/null 2>&1; \
-                  then echo "-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE \
-                             -D_FILE_OFFSET_BITS=64"; fi)
+ifdef LISP_FEATURE_LARGEFILE
+  CFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+endif
 
-OS_LIBS += $(shell if grep LISP_FEATURE_SB_THREAD genesis/config.h \
-                      > /dev/null 2>&1; \
-                   then echo "-lpthread"; fi)
+ifdef LISP_FEATURE_SB_THREAD
+  OS_LIBS += -lpthread
+endif
 
 GC_SRC = gencgc.c
 

Index: Config.x86_64-linux
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/Config.x86_64-linux,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Config.x86_64-linux	16 Sep 2005 13:26:39 -0000	1.5
+++ Config.x86_64-linux	13 Nov 2006 16:03:31 -0000	1.6
@@ -30,9 +30,9 @@
 LINKFLAGS += -Wl,--export-dynamic
 OS_LIBS = -ldl
 
-OS_LIBS += $(shell if grep LISP_FEATURE_SB_THREAD genesis/config.h \
-                      > /dev/null 2>&1; \
-                   then echo "-lpthread"; fi)
+ifdef LISP_FEATURE_SB_THREAD
+  OS_LIBS += -lpthread
+endif
 
 CFLAGS += -fno-omit-frame-pointer
 

Index: GNUmakefile
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/runtime/GNUmakefile,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- GNUmakefile	12 Nov 2006 23:04:59 -0000	1.27
+++ GNUmakefile	13 Nov 2006 16:03:31 -0000	1.28
@@ -27,6 +27,9 @@
 ASFLAGS = $(CFLAGS)
 CPPFLAGS = -I.
 
+# Give make access to the target Lisp features.
+include genesis/Makefile.features
+
 # The Config file is the preferred place for tweaking options which
 # are appropriate for particular setups (OS, ARCH, whatever). Make a
 # Config-foo file for setup foo, then arrange for Config to be a
@@ -35,7 +38,6 @@
 # OS_SRC, OS_LIBS, OS_OBJS, OS_CLEAN_FILES
 include Config
 
-
 COMMON_SRC = alloc.c backtrace.c breakpoint.c coreparse.c \
 	dynbind.c gc-common.c globals.c interr.c interrupt.c largefile.c \
 	monitor.c os-common.c parse.c print.c purify.c pthread-lutex.c \