2002-04-26 Jeff Johnston <jjohnstn@redhat.com>

* configure.in (CC_FOR_NEWLIB): New variable that
        bases on $(CC) and adds targ-include and libc/include as
        -isystem directives if they are not already part of $(CC).
        * Makefile.am (AM_MAKEFLAGS): Change setting of CC to equal
        $(CC_FOR_NEWLIB).
        * configure: Regenerated.
        * Makefile.in: Ditto.
This commit is contained in:
Jeff Johnston 2002-04-26 20:18:52 +00:00
parent b807c4ad01
commit 7b2b12d51b
5 changed files with 32 additions and 12 deletions

View File

@ -1,3 +1,13 @@
2002-04-26 Jeff Johnston <jjohnstn@redhat.com>
* configure.in (CC_FOR_NEWLIB): New variable that
bases on $(CC) and adds targ-include and libc/include as
-isystem directives if they are not already part of $(CC).
* Makefile.am (AM_MAKEFLAGS): Change setting of CC to equal
$(CC_FOR_NEWLIB).
* configure: Regenerated.
* Makefile.in: Ditto.
2002-04-25 Jeff Johnston <jjohnstn@redhat.com>
* libc/sys/linux/Makefile.am: Add support for sched.c.

View File

@ -45,7 +45,7 @@ AM_MAKEFLAGS = \
"tooldir=$(tooldir)" \
"AR=$(AR)" \
"AS=$(AS)" \
"CC=$(CC)" \
"CC=$(CC_FOR_NEWLIB)" \
"LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \

View File

@ -68,6 +68,7 @@ AS = @AS@
AWK = @AWK@
CC = @CC@
CC_FOR_BUILD = @CC_FOR_BUILD@
CC_FOR_NEWLIB = @CC_FOR_NEWLIB@
CPP = @CPP@
CRT0 = @CRT0@
CRT0_DIR = @CRT0_DIR@
@ -141,7 +142,7 @@ AM_MAKEFLAGS = \
"tooldir=$(tooldir)" \
"AR=$(AR)" \
"AS=$(AS)" \
"CC=$(CC)" \
"CC=$(CC_FOR_NEWLIB)" \
"LD=$(LD)" \
"LIBCFLAGS=$(LIBCFLAGS)" \
"NM=$(NM)" \

15
newlib/configure vendored
View File

@ -2386,6 +2386,15 @@ else
HAVE_DOC_FALSE=
fi
# These get added in the top-level configure.in, except in the case where
# newlib is being built natively.
if test -z `echo ${CC} | grep \/libc\/include`; then
CC_FOR_NEWLIB="${CC} -isystem $PWD/targ-include -isystem ${newlib_basedir}/libc/include"
else
CC_FOR_NEWLIB="${CC}"
fi
subdirs="${configdirs}"
@ -2452,11 +2461,6 @@ if test -z "$CC_FOR_BUILD"; then
fi
# These get added in the top-level configure.in, except in the case where
# newlib is being built natively.
if test -z `echo ${CC} | grep \/libc\/include`; then
CC="${CC} -isystem $PWD/targ-include -isystem ${newlib_basedir}/libc/include"
fi
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"
@ -2662,6 +2666,7 @@ s%@NEWLIB_HW_FP_TRUE@%$NEWLIB_HW_FP_TRUE%g
s%@NEWLIB_HW_FP_FALSE@%$NEWLIB_HW_FP_FALSE%g
s%@HAVE_DOC_TRUE@%$HAVE_DOC_TRUE%g
s%@HAVE_DOC_FALSE@%$HAVE_DOC_FALSE%g
s%@CC_FOR_NEWLIB@%$CC_FOR_NEWLIB%g
s%@subdirs@%$subdirs%g
s%@CRT0@%$CRT0%g
s%@CRT0_DIR@%$CRT0_DIR%g

View File

@ -37,6 +37,15 @@ else
fi
AM_CONDITIONAL(HAVE_DOC, test x$have_doc = xyes)
# These get added in the top-level configure.in, except in the case where
# newlib is being built natively.
if test -z `echo ${CC} | grep \/libc\/include`; then
CC_FOR_NEWLIB="${CC} -isystem $PWD/targ-include -isystem ${newlib_basedir}/libc/include"
else
CC_FOR_NEWLIB="${CC}"
fi
AC_SUBST(CC_FOR_NEWLIB)
AC_CONFIG_SUBDIRS(${configdirs})
CRT0=
@ -102,11 +111,6 @@ if test -z "$CC_FOR_BUILD"; then
fi
AC_SUBST(CC_FOR_BUILD)
# These get added in the top-level configure.in, except in the case where
# newlib is being built natively.
if test -z `echo ${CC} | grep \/libc\/include`; then
CC="${CC} -isystem $PWD/targ-include -isystem ${newlib_basedir}/libc/include"
fi
if test "${multilib}" = "yes"; then
multilib_arg="--enable-multilib"