Distinguish LOCAL_LDFLAGS and LOCAL_LCFLAGS from LOCAL_CFLAGS.

In particular, never put -lm in LOCAL_[L]CFLAGS because it
disables an implicit rule that has LOCAL_CFLAGS as a prerequisite.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@1281 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile.target b/test/Makefile.target
index acc4092a97d42f2a417b3f7c1df3c0bcb6c3a9ce..beac97847c5fa2df5f5398248bbb9de4ddc816d8 100644 (file)
--- a/test/Makefile.target
+++ b/test/Makefile.target
@@ -19,7 +19,7 @@ LLINK    = $(TOOLS)/link
 LLCFLAGS =
 
 LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
-LCFLAGS  = -O2 $(LOCAL_CFLAGS) -Wall
+LCFLAGS  = -O2 $(LOCAL_LCFLAGS) -Wall
 
 LLCLIB   = $(LEVEL)/test/runtime.o
 LIBS     = $(LLCLIB) $(LOCAL_LIBS)
@@ -32,9 +32,9 @@ CC      = /opt/SUNWspro/bin/cc
 AS     = /opt/SUNWspro/bin/cc
 DIS     = /usr/ccs/bin/dis
 CP     = /bin/cp -p
-CFLAGS  = -g -xarch=v9
+CFLAGS  = -g -xarch=v9 $(LOCAL_CFLAGS)
 CCFLAGS = $(CFLAGS)
-LDFLAGS = $(CFLAGS)
+LDFLAGS = $(CFLAGS) $(LOCAL_LDFLAGS)
 ASFLAGS = -c $(CFLAGS)
 
 ## Special targets to build a program from multiple source files
@@ -55,7 +55,7 @@ ifdef PROG
        $(RM) $(PROG).tmp.bc
 
   $(PROG).native: $(OBJS:.o=.c)
-       $(CC) $(OBJS:.o=.c) -O $(LOCAL_CFLAGS) -lm -o $@
+       $(CC) $(OBJS:.o=.c) -O $(LOCAL_LCFLAGS) $(CFLAGS) -lm -o $@
 endif
 
 ## Special target to force target-dependent library to be compiled

diff --git a/test/Makefile.tests b/test/Makefile.tests
index acc4092a97d42f2a417b3f7c1df3c0bcb6c3a9ce..beac97847c5fa2df5f5398248bbb9de4ddc816d8 100644 (file)
--- a/test/Makefile.tests
+++ b/test/Makefile.tests
@@ -19,7 +19,7 @@ LLINK    = $(TOOLS)/link
 LLCFLAGS =
 
 LCC      = /home/vadve/lattner/cvs/gcc_install/bin/gcc
-LCFLAGS  = -O2 $(LOCAL_CFLAGS) -Wall
+LCFLAGS  = -O2 $(LOCAL_LCFLAGS) -Wall
 
 LLCLIB   = $(LEVEL)/test/runtime.o
 LIBS     = $(LLCLIB) $(LOCAL_LIBS)
@@ -32,9 +32,9 @@ CC      = /opt/SUNWspro/bin/cc
 AS     = /opt/SUNWspro/bin/cc
 DIS     = /usr/ccs/bin/dis
 CP     = /bin/cp -p
-CFLAGS  = -g -xarch=v9
+CFLAGS  = -g -xarch=v9 $(LOCAL_CFLAGS)
 CCFLAGS = $(CFLAGS)
-LDFLAGS = $(CFLAGS)
+LDFLAGS = $(CFLAGS) $(LOCAL_LDFLAGS)
 ASFLAGS = -c $(CFLAGS)
 
 ## Special targets to build a program from multiple source files
@@ -55,7 +55,7 @@ ifdef PROG
        $(RM) $(PROG).tmp.bc
 
   $(PROG).native: $(OBJS:.o=.c)
-       $(CC) $(OBJS:.o=.c) -O $(LOCAL_CFLAGS) -lm -o $@
+       $(CC) $(OBJS:.o=.c) -O $(LOCAL_LCFLAGS) $(CFLAGS) -lm -o $@
 endif
 
 ## Special target to force target-dependent library to be compiled