aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Werner <mtw@cygnus>1993-01-16 01:05:50 +0000
committerMike Werner <mtw@cygnus>1993-01-16 01:05:50 +0000
commit7d9f0c54d614f654124963d8e1b48fd884b92f24 (patch)
treeba8df62b0906a34e31eb61c815b47202d69cf1ee
parent8fa0d3a01237d349f21803df735deedc01c1bd3b (diff)
downloadgdb-7d9f0c54d614f654124963d8e1b48fd884b92f24.zip
gdb-7d9f0c54d614f654124963d8e1b48fd884b92f24.tar.gz
gdb-7d9f0c54d614f654124963d8e1b48fd884b92f24.tar.bz2
* Makefile.in: added variables CHILL_FOR_TARGET, CHILLFLAGS,
and CHILL_LIB. * deja-gnu/gdb.t31/Makefile.in: removed explicit setting of CHILL variables as these are now passed down from the top level makefile using FLAGS_TO_PASS.
-rw-r--r--ChangeLog10
-rw-r--r--Makefile.in34
2 files changed, 43 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0834308..db42512 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Fri Jan 15 16:40:54 1993 Mike Werner (mtw@rtl.cygnus.com)
+
+ **** start-sanitize-chill ****
+ * Makefile.in: added variables CHILL_FOR_TARGET, CHILLFLAGS,
+ and CHILL_LIB.
+ * deja-gnu/gdb.t31/Makefile.in: removed explicit setting of
+ CHILL variables as these are now passed down from the top
+ level makefile using FLAGS_TO_PASS.
+ **** end-sanitize-chill ****
+
Fri Jan 15 10:27:02 1993 Ian Lance Taylor (ian@cygnus.com)
* Makefile.in (GCC_FLAGS_TO_PASS): New variable.
diff --git a/Makefile.in b/Makefile.in
index e6a104e..52413d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,10 +53,13 @@ AS = as
AR = ar
AR_FLAGS = rc
CC = cc
+$(start-sanitize-chill)
CFLAGS = -g
+CHILLFLAGS = $(CFLAGS)
+CHILL_LIB = -lchill
+$(end-sanitize-chill)
CXX = gcc
CXXFLAGS = -g -O
-GCC_FOR_TARGET = ./xgcc -B./
RANLIB = ranlib
NM = nm
@@ -98,6 +101,30 @@ CC_FOR_TARGET = ` \
fi; \
fi`
+GCC_FOR_TARGET = ` \
+ if [ -f $${rootme}/gcc/Makefile ] ; then \
+ echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/; \
+ else \
+ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+ echo $(CC); \
+ else \
+ t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
+ fi; \
+ fi`
+
+$(start-sanitize-chill)
+CHILL_FOR_TARGET = ` \
+ if [ -f $${rootme}/gcc/Makefile ] ; then \
+ echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/ -L$${rootme}/chillrt/; \
+ else \
+ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
+ echo $(CC); \
+ else \
+ t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
+ fi; \
+ fi`
+$(end-sanitize-chill)
+
CXX_FOR_TARGET = ` \
if [ -f $${rootme}/gcc/Makefile ] ; then \
echo $${rootme}/gcc/xgcc -B$${rootme}/gcc/; \
@@ -179,6 +206,11 @@ FLAGS_TO_PASS = \
"CC=$(CC)" \
"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
"CFLAGS=$(CFLAGS)" \
+$(start-sanitize-chill)\
+ "CHILLFLAGS=$(CHILLFLAGS)" \
+ "CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
+ "CHILL_LIB=$(CHILL_LIB)" \
+$(start-sanitize-chill)\
"GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \
"INSTALL=$(INSTALL)" \
"INSTALL_DATA=$(INSTALL_DATA)" \