From fc50413595f313cd07b10510973c81f48125ea8e Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Tue, 18 Dec 2001 02:22:55 +0000 Subject: [PATCH] * libc/stdlib/Makefile.am (LIB_COMPILE): Change to equal $(COMPILE) rather than $(CC). * libc/stdio/Makefile.am (LIB_COMPILE): Likewise. (vfprintf.$(oext)): Remove $(INCLUDES), made redundant by $(LIB_COMPILE) change. (vfiprintf.$(oext)): Likewise. --- newlib/ChangeLog | 9 +++++++++ newlib/libc/stdio/Makefile.am | 6 +++--- newlib/libc/stdio/Makefile.in | 6 +++--- newlib/libc/stdlib/Makefile.am | 2 +- newlib/libc/stdlib/Makefile.in | 2 +- 5 files changed, 17 insertions(+), 8 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index f5fab93bb..d1e4e74c4 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,12 @@ +2001-12-17 Thomas Fitzsimmons + + * libc/stdlib/Makefile.am (LIB_COMPILE): Change to equal + $(COMPILE) rather than $(CC). + * libc/stdio/Makefile.am (LIB_COMPILE): Likewise. + (vfprintf.$(oext)): Remove $(INCLUDES), made redundant by + $(LIB_COMPILE) change. + (vfiprintf.$(oext)): Likewise. + 2001-12-17 Corinna Vinschen * libc/sys/cygwin/include/unistd.h: Add __UNISTD_GETOPT_ to allow diff --git a/newlib/libc/stdio/Makefile.am b/newlib/libc/stdio/Makefile.am index 3f64aa5fa..8010c7203 100644 --- a/newlib/libc/stdio/Makefile.am +++ b/newlib/libc/stdio/Makefile.am @@ -83,7 +83,7 @@ else noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_LIBADD = $(LIBADD_OBJS) -LIB_COMPILE = $(CC) +LIB_COMPILE = $(COMPILE) noinst_DATA = endif # USE_LIBTOOL @@ -93,10 +93,10 @@ include $(srcdir)/../../Makefile.shared # libtool moves vfprintf.o and subsequently can't find it. vfprintf.$(oext): vfprintf.c - $(LIB_COMPILE) $(INCLUDES) -c $(srcdir)/vfprintf.c + $(LIB_COMPILE) -c $(srcdir)/vfprintf.c vfiprintf.$(oext): vfprintf.c - $(LIB_COMPILE) $(INCLUDES) -DINTEGER_ONLY -c $(srcdir)/vfprintf.c -o $@ + $(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfprintf.c -o $@ CHEWOUT_FILES = \ clearerr.def \ diff --git a/newlib/libc/stdio/Makefile.in b/newlib/libc/stdio/Makefile.in index d069110e5..b8feba470 100644 --- a/newlib/libc/stdio/Makefile.in +++ b/newlib/libc/stdio/Makefile.in @@ -169,7 +169,7 @@ libstdio_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@libstdio_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) @USE_LIBTOOL_TRUE@libstdio_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIBADD_OBJS) @USE_LIBTOOL_TRUE@LIB_COMPILE = @USE_LIBTOOL_TRUE@$(LTCOMPILE) -@USE_LIBTOOL_FALSE@LIB_COMPILE = @USE_LIBTOOL_FALSE@$(CC) +@USE_LIBTOOL_FALSE@LIB_COMPILE = @USE_LIBTOOL_FALSE@$(COMPILE) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a @@ -497,10 +497,10 @@ objectlist.awk.in: $(noinst_LTLIBRARIES) # libtool moves vfprintf.o and subsequently can't find it. vfprintf.$(oext): vfprintf.c - $(LIB_COMPILE) $(INCLUDES) -c $(srcdir)/vfprintf.c + $(LIB_COMPILE) -c $(srcdir)/vfprintf.c vfiprintf.$(oext): vfprintf.c - $(LIB_COMPILE) $(INCLUDES) -DINTEGER_ONLY -c $(srcdir)/vfprintf.c -o $@ + $(LIB_COMPILE) -DINTEGER_ONLY -c $(srcdir)/vfprintf.c -o $@ .c.def: $(CHEW) < $< > $*.def 2> $*.ref diff --git a/newlib/libc/stdlib/Makefile.am b/newlib/libc/stdlib/Makefile.am index e45b5a950..8c7687e70 100644 --- a/newlib/libc/stdlib/Makefile.am +++ b/newlib/libc/stdlib/Makefile.am @@ -96,7 +96,7 @@ else noinst_LIBRARIES = lib.a lib_a_SOURCES = $(LIB_SOURCES) lib_a_LIBADD = $(LIBADD_OBJS) -LIB_COMPILE = $(CC) +LIB_COMPILE = $(COMPILE) noinst_DATA = endif # USE_LIBTOOL diff --git a/newlib/libc/stdlib/Makefile.in b/newlib/libc/stdlib/Makefile.in index bed8d9ec1..8ae3d154d 100644 --- a/newlib/libc/stdlib/Makefile.in +++ b/newlib/libc/stdlib/Makefile.in @@ -183,7 +183,7 @@ libstdlib_la_LDFLAGS = -Xcompiler -nostdlib @USE_LIBTOOL_TRUE@libstdlib_la_SOURCES = @USE_LIBTOOL_TRUE@$(LIB_SOURCES) @USE_LIBTOOL_TRUE@libstdlib_la_LIBADD = @USE_LIBTOOL_TRUE@$(LIBADD_OBJS) @USE_LIBTOOL_TRUE@LIB_COMPILE = @USE_LIBTOOL_TRUE@$(LTCOMPILE) -@USE_LIBTOOL_FALSE@LIB_COMPILE = @USE_LIBTOOL_FALSE@$(CC) +@USE_LIBTOOL_FALSE@LIB_COMPILE = @USE_LIBTOOL_FALSE@$(COMPILE) @USE_LIBTOOL_TRUE@noinst_DATA = @USE_LIBTOOL_TRUE@objectlist.awk.in @USE_LIBTOOL_FALSE@noinst_DATA = @USE_LIBTOOL_FALSE@noinst_LIBRARIES = @USE_LIBTOOL_FALSE@lib.a