mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-02-21 00:07:36 +08:00
libgloss: i386: simplify target flags
Collapse these 3 settings into one variable to make it easier to merge into the top-level.
This commit is contained in:
parent
2a83e65fc2
commit
e05f9c0c05
@ -90,10 +90,10 @@ libcygmon.a: $(CYGMON_OBJS)
|
||||
${RANLIB} $@
|
||||
|
||||
cygmon-salib.o: ${srcdir}/cygmon-salib.c
|
||||
$(CC) -c $(CFLAGS) @NEED_UNDERSCORE@ @IS_COFF@ @IS_AOUT@ $(<) -o $@
|
||||
$(CC) -c $(CFLAGS) $(I386_CPPFLAGS) $(<) -o $@
|
||||
|
||||
cygmon-crt0.o: ${srcdir}/cygmon-crt0.S
|
||||
$(CC) -c $(CFLAGS) @NEED_UNDERSCORE@ @IS_COFF@ @IS_AOUT@ $(<) -o $@
|
||||
$(CC) -c $(CFLAGS) $(I386_CPPFLAGS) $(<) -o $@
|
||||
|
||||
doc:
|
||||
|
||||
|
13
libgloss/i386/configure
vendored
13
libgloss/i386/configure
vendored
@ -589,9 +589,6 @@ host_makefile_frag_path
|
||||
CCASFLAGS
|
||||
CCAS
|
||||
RANLIB
|
||||
NEED_UNDERSCORE
|
||||
IS_AOUT
|
||||
IS_COFF
|
||||
LD
|
||||
AR
|
||||
AS
|
||||
@ -607,6 +604,7 @@ am__include
|
||||
DEPDIR
|
||||
am__leading_dot
|
||||
CC
|
||||
I386_CPPFLAGS
|
||||
INSTALL_DATA
|
||||
INSTALL_SCRIPT
|
||||
INSTALL_PROGRAM
|
||||
@ -2017,15 +2015,17 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||
|
||||
|
||||
I386_CPPFLAGS=
|
||||
case "$target" in
|
||||
*coff)
|
||||
IS_COFF="-DCOFF"
|
||||
I386_CPPFLAGS="-DCOFF"
|
||||
;;
|
||||
*aout)
|
||||
IS_AOUT="-DAOUT"
|
||||
I386_CPPFLAGS="-DAOUT"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
rm -rf .tst 2>/dev/null
|
||||
mkdir .tst 2>/dev/null
|
||||
if test -d .tst; then
|
||||
@ -2449,9 +2449,6 @@ AR=${AR-ar}
|
||||
|
||||
LD=${LD-ld}
|
||||
|
||||
|
||||
|
||||
|
||||
if test -n "$ac_tool_prefix"; then
|
||||
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
|
||||
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
|
||||
|
@ -21,14 +21,16 @@ AC_ARG_PROGRAM
|
||||
|
||||
AC_PROG_INSTALL
|
||||
|
||||
I386_CPPFLAGS=
|
||||
case "$target" in
|
||||
*coff)
|
||||
IS_COFF="-DCOFF"
|
||||
I386_CPPFLAGS="-DCOFF"
|
||||
;;
|
||||
*aout)
|
||||
IS_AOUT="-DAOUT"
|
||||
I386_CPPFLAGS="-DAOUT"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(I386_CPPFLAGS)
|
||||
|
||||
LIB_AC_PROG_CC
|
||||
AS=${AS-as}
|
||||
@ -37,9 +39,6 @@ AR=${AR-ar}
|
||||
AC_SUBST(AR)
|
||||
LD=${LD-ld}
|
||||
AC_SUBST(LD)
|
||||
AC_SUBST(IS_COFF)
|
||||
AC_SUBST(IS_AOUT)
|
||||
AC_SUBST(NEED_UNDERSCORE)
|
||||
AC_PROG_RANLIB
|
||||
LIB_AM_PROG_AS
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user