From a923563fe3475ea90faa7e8e3c378436f41daa39 Mon Sep 17 00:00:00 2001 From: Raymond Toy <toy.raymond@gmail.com> Date: Sat, 4 May 2013 12:35:32 -0700 Subject: [PATCH] Clean up variables. Config.sparc_common:: * Use += instead of = for CPPFLAGS and CFLAGS Config.sparc_gcc: * Move options from CC to CFLAGS. Config.sparc_gcc: * Move options from CC to CFLAGS. * Add DEPEND_FLAGS with appropriate options. --- src/lisp/Config.sparc_common | 4 ++-- src/lisp/Config.sparc_gcc | 5 +++-- src/lisp/Config.sparc_sunc | 7 ++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/lisp/Config.sparc_common b/src/lisp/Config.sparc_common index 16f99fb70..89e2de04a 100644 --- a/src/lisp/Config.sparc_common +++ b/src/lisp/Config.sparc_common @@ -46,10 +46,10 @@ ifdef FEATURE_UNICODE UNICODE = -DUNICODE endif -CPPFLAGS = -I. -I$(PATH1) -DSOLARIS -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC) $(UNICODE) $(SSE2) +CPPFLAGS += -I. -I$(PATH1) -DSOLARIS -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC) $(UNICODE) $(SSE2) -CFLAGS = -g $(CC_V8PLUS) +CFLAGS += -g $(CC_V8PLUS) NM = $(PATH1)/solaris-nm ASSEM_SRC = sparc-assem.S diff --git a/src/lisp/Config.sparc_gcc b/src/lisp/Config.sparc_gcc index d08af18f6..da6d06eef 100644 --- a/src/lisp/Config.sparc_gcc +++ b/src/lisp/Config.sparc_gcc @@ -24,7 +24,8 @@ endif # and SIGSEGV) to lisp properly. # -CC = gcc -O -Wall -CPP = gcc -E +CC = gcc +CPP = gcc +CFLAGS += -O -Wall DEPEND_FLAGS = -MM ASFLAGS = -g -traditional-cpp $(AS_V8PLUS) diff --git a/src/lisp/Config.sparc_sunc b/src/lisp/Config.sparc_sunc index 1072f7b96..e1614e626 100644 --- a/src/lisp/Config.sparc_sunc +++ b/src/lisp/Config.sparc_sunc @@ -20,7 +20,8 @@ CC_V8PLUS = -m32 -xarch=sparc AS_V8PLUS = -m32 -xarch=sparc endif -CC = cc -xlibmieee -O -CPP = cc -E -DEPEND_FLAGS = -xM +CC = cc +CPP = cc +CFLAGS += -xlibmieee -O +DEPEND_FLAGS = -E -xM ASFLAGS = $(AS_V8PLUS) -- GitLab