From 23831498b16442a4b43039099a1d9451cddfe76b Mon Sep 17 00:00:00 2001 From: agoncharov <agoncharov> Date: Tue, 20 Jan 2009 04:52:47 +0000 Subject: [PATCH] Bringing a bit more structure to the build system --- lisp/Config.x86_common | 5 +++-- lisp/Config.x86_freebsd | 2 +- lisp/GNUmakefile | 11 +---------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/lisp/Config.x86_common b/lisp/Config.x86_common index d52003211..fe1649292 100644 --- a/lisp/Config.x86_common +++ b/lisp/Config.x86_common @@ -28,9 +28,8 @@ ifneq ($(or $(FEATURE_X87),$(FEATURE_SSE2)),) CPP_DEFINE_OPTIONS += -DFEATURE_SSE2 endif -CC ?= gcc +CC = gcc LD = ld -CPP = cpp ifeq ($(filter 2% 3%, $(shell $(CC) -dumpversion)),) CPP_INCLUDE_OPTIONS := -iquote . -iquote $(PATH1) @@ -47,6 +46,8 @@ ARCH_SRC = x86-arch.c OS_SRC = os-common.c e_rem_pio2.c k_rem_pio2.c NM = nm -gp +DEPEND = $(CC) -MM -E +DEPEND_FLAGS = # This has aliasing problems, so turn off aliasing and also turn on # float-store so x87 arithmetic behaves like double-precision diff --git a/lisp/Config.x86_freebsd b/lisp/Config.x86_freebsd index ce7bcce2f..b1b2d6f45 100644 --- a/lisp/Config.x86_freebsd +++ b/lisp/Config.x86_freebsd @@ -2,6 +2,6 @@ include Config.x86_common UNDEFSYMPATTERN = -Xlinker -u -Xlinker & -OS_SRC += FreeBSD-os.c undefineds.c elf.c +OS_SRC += FreeBSD-os.c elf.c OS_LINK_FLAGS = -dynamic -export-dynamic OS_LIBS = -lutil diff --git a/lisp/GNUmakefile b/lisp/GNUmakefile index e1cf0a0db..63934b0fc 100644 --- a/lisp/GNUmakefile +++ b/lisp/GNUmakefile @@ -1,19 +1,10 @@ -# $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/GNUmakefile,v 1.32 2009/01/11 17:52:44 rtoy Exp $ +# $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/lisp/GNUmakefile,v 1.33 2009/01/20 04:52:47 agoncharov Rel $ all: lisp.nm -DEPEND = $(CC) -MM -E -DEPEND_FLAGS = - -include internals.inc include Config -CC ?= gcc - -ifndef GC_SRC -GC_SRC = gc.c -endif - SRCS = lisp.c coreparse.c alloc.c monitor.c print.c interr.c \ vars.c parse.c interrupt.c search.c validate.c globals.c \ dynbind.c breakpoint.c regnames.c backtrace.c save.c purify.c \ -- GitLab