Be consistant for all the client code, and use TARGET_CC with --uclibc-use-build-dir

4 files changed, 32 insertions, 34 deletions

diff --git a/libm/Makefile b/libm/Makefile
index c07190fb1..c6ac49ce0 100644
--- a/libm/Makefile
+++ b/libm/Makefile
@@ -25,7 +25,6 @@ include $(TOPDIR)Rules.mak
 LIBM=libm.a
 LIBM_SHARED=libm.so
 LIBM_SHARED_FULLNAME=libm-$(MAJOR_VERSION).$(MINOR_VERSION).so
-TARGET_CC= $(TOPDIR)extra/gcc-uClibc/$(TARGET_ARCH)-uclibc-gcc
 
 DIRS=
 ifeq ($(strip $(HAS_LIBM_FLOAT)),true)
@@ -53,14 +52,13 @@ tags:
 
 shared: all
 	if [ -f $(LIBM) ] ; then \
-		$(TARGET_CC) $(LDFLAGS) -shared -o $(LIBM_SHARED_FULLNAME) \
-		    -Wl,-soname,$(LIBM_SHARED).$(MAJOR_VERSION) -Wl,--whole-archive \
-		    $(LIBM) $(TOPDIR)lib/$(SHARED_FULLNAME); \
-		install -d $(TOPDIR)lib; \
-		rm -f $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
-		install -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \
-		(cd $(TOPDIR)lib; ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED)); \
-		(cd $(TOPDIR)lib; ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED).$(MAJOR_VERSION)); \
+	    $(TARGET_CC) $(TARGET_LDFLAGS) -nostdlib -shared -o $(LIBM_SHARED_FULLNAME) \
+		-Wl,-soname,$(LIBM_SHARED).$(MAJOR_VERSION) -Wl,--whole-archive $(LIBM); \
+	    install -d $(TOPDIR)lib; \
+	    rm -f $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
+	    install -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \
+	    (cd $(TOPDIR)lib; ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED)); \
+	    (cd $(TOPDIR)lib; ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED).$(MAJOR_VERSION)); \
 	fi;
 
 subdirs: $(patsubst %, _dir_%, $(DIRS))
diff --git a/libm/double/Makefile b/libm/double/Makefile
index 6133ef199..a53b44d2e 100644
--- a/libm/double/Makefile
+++ b/libm/double/Makefile
@@ -50,7 +50,7 @@ ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBM) $(OBJS)
 
 $(COBJS): %.o : %.c
-	$(TARGET_CC) $(CFLAGS) -c $< -o $@
+	$(TARGET_CC) $(TARGET_CFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(OBJ): Makefile
@@ -65,37 +65,37 @@ clean:
 #all: libmd.a mtst dtestvec monot dcalc paranoia
 
 time-it: time-it.o
-	$(CC) -o time-it time-it.o
+	$(TARGET_CC) -o time-it time-it.o
 
 time-it.o: time-it.c
-	$(CC) -O2 -c time-it.c
+	$(TARGET_CC) -O2 -c time-it.c
 
 dcalc: dcalc.o libmd.a
-	$(CC) -o dcalc dcalc.o libmd.a
+	$(TARGET_CC) -o dcalc dcalc.o libmd.a
 
 mtst: mtst.o libmd.a
-	$(CC) -v -o mtst mtst.o libmd.a
+	$(TARGET_CC) -v -o mtst mtst.o libmd.a
 
 mtst.o: mtst.c
-	$(CC) -O2 -Wall -c mtst.c
+	$(TARGET_CC) -O2 -Wall -c mtst.c
 
 dtestvec: dtestvec.o libmd.a
-	$(CC) -o dtestvec dtestvec.o libmd.a
+	$(TARGET_CC) -o dtestvec dtestvec.o libmd.a
 
 dtestvec.o: dtestvec.c
-	$(CC) -g -c dtestvec.c
+	$(TARGET_CC) -g -c dtestvec.c
 
 monot: monot.o libmd.a
-	$(CC) -o monot monot.o libmd.a
+	$(TARGET_CC) -o monot monot.o libmd.a
 
 monot.o: monot.c
-	$(CC) -g -c monot.c
+	$(TARGET_CC) -g -c monot.c
 
 paranoia: paranoia.o setprec.o libmd.a
-	$(CC) -o paranoia paranoia.o setprec.o libmd.a
+	$(TARGET_CC) -o paranoia paranoia.o setprec.o libmd.a
 
 paranoia.o: paranoia.c
-	$(CC) $(CFLAGS) -Wno-implicit -c paranoia.c
+	$(TARGET_CC) $(TARGET_CFLAGS) -Wno-implicit -c paranoia.c
 
 libmd.a: $(OBJS) $(INCS)
 	$(AR) rv libmd.a $(OBJS)
diff --git a/libm/float/Makefile b/libm/float/Makefile
index bae5fecea..80f7aa1ff 100644
--- a/libm/float/Makefile
+++ b/libm/float/Makefile
@@ -49,7 +49,7 @@ ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBM) $(OBJS)
 
 $(COBJS): %.o : %.c
-	$(TARGET_CC) $(CFLAGS) -c $< -o $@
+	$(TARGET_CC) $(TARGET_CFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(OBJ): Makefile
diff --git a/libm/ldouble/Makefile b/libm/ldouble/Makefile
index 04b3aacac..dad448840 100644
--- a/libm/ldouble/Makefile
+++ b/libm/ldouble/Makefile
@@ -45,7 +45,7 @@ ar-target: $(OBJS)
 	$(AR) $(ARFLAGS) $(LIBM) $(OBJS)
 
 $(COBJS): %.o : %.c
-	$(TARGET_CC) $(CFLAGS) -c $< -o $@
+	$(TARGET_CC) $(TARGET_CFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(OBJ): Makefile
@@ -61,20 +61,20 @@ clean:
 #all: mtstl lparanoi lcalc fltestl nantst testvect monotl libml.a
 
 mtstl: libml.a mtstl.o $(OBJS)
-	$(CC) $(CFLAGS) -o mtstl mtstl.o libml.a $(LIBS)
+	$(TARGET_CC) $(TARGET_CFLAGS) -o mtstl mtstl.o libml.a $(LIBS)
 
 mtstl.o: mtstl.c
 
 lparanoi: libml.a lparanoi.o setprec.o ieee.o econst.o $(OBJS)
-	$(CC) $(CFLAGS) -o lparanoi lparanoi.o setprec.o ieee.o econst.o libml.a $(LIBS)
+	$(TARGET_CC) $(TARGET_CFLAGS) -o lparanoi lparanoi.o setprec.o ieee.o econst.o libml.a $(LIBS)
 
 lparanoi.o: lparanoi.c
-	$(CC) $(CFLAGS) -Wno-implicit -c lparanoi.c
+	$(TARGET_CC) $(TARGET_CFLAGS) -Wno-implicit -c lparanoi.c
 
 econst.o: econst.c ehead.h
 
 lcalc: libml.a lcalc.o ieee.o econst.o $(OBJS)
-	$(CC) $(CFLAGS) -o lcalc lcalc.o ieee.o econst.o libml.a $(LIBS)
+	$(TARGET_CC) $(TARGET_CFLAGS) -o lcalc lcalc.o ieee.o econst.o libml.a $(LIBS)
 
 lcalc.o: lcalc.c lcalc.h ehead.h
 
@@ -87,31 +87,31 @@ libml.a: $(OBJS) mconf.h
 
 
 fltestl: fltestl.c libml.a
-	$(CC) $(CFLAGS) -o fltestl fltestl.c libml.a
+	$(TARGET_CC) $(TARGET_CFLAGS) -o fltestl fltestl.c libml.a
 
 fltestl.o: fltestl.c
 
 flrtstl: flrtstl.c libml.a
-	$(CC) $(CFLAGS) -o flrtstl flrtstl.c libml.a
+	$(TARGET_CC) $(TARGET_CFLAGS) -o flrtstl flrtstl.c libml.a
 
 flrtstl.o: flrtstl.c
 
 nantst: nantst.c libml.a
-	$(CC) $(CFLAGS) -o nantst nantst.c libml.a
+	$(TARGET_CC) $(TARGET_CFLAGS) -o nantst nantst.c libml.a
 
 nantst.o: nantst.c
 
 testvect: testvect.o libml.a
-	$(CC) $(CFLAGS) -o testvect testvect.o libml.a
+	$(TARGET_CC) $(TARGET_CFLAGS) -o testvect testvect.o libml.a
 
 testvect.o: testvect.c
-	$(CC) -g -c -o testvect.o testvect.c
+	$(TARGET_CC) -g -c -o testvect.o testvect.c
 
 monotl: monotl.o libml.a
-	$(CC) $(CFLAGS) -o monotl monotl.o libml.a
+	$(TARGET_CC) $(TARGET_CFLAGS) -o monotl monotl.o libml.a
 
 monotl.o: monotl.c
-	$(CC) -g -c -o monotl.o monotl.c
+	$(TARGET_CC) -g -c -o monotl.o monotl.c
 
 # Run test programs
 check: mtstl fltestl testvect monotl libml.a