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:
Mike Frysinger 2022-02-11 06:39:54 -05:00
parent 2a83e65fc2
commit e05f9c0c05
3 changed files with 11 additions and 15 deletions

View File

@ -90,10 +90,10 @@ libcygmon.a: $(CYGMON_OBJS)
${RANLIB} $@ ${RANLIB} $@
cygmon-salib.o: ${srcdir}/cygmon-salib.c 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 cygmon-crt0.o: ${srcdir}/cygmon-crt0.S
$(CC) -c $(CFLAGS) @NEED_UNDERSCORE@ @IS_COFF@ @IS_AOUT@ $(<) -o $@ $(CC) -c $(CFLAGS) $(I386_CPPFLAGS) $(<) -o $@
doc: doc:

View File

@ -589,9 +589,6 @@ host_makefile_frag_path
CCASFLAGS CCASFLAGS
CCAS CCAS
RANLIB RANLIB
NEED_UNDERSCORE
IS_AOUT
IS_COFF
LD LD
AR AR
AS AS
@ -607,6 +604,7 @@ am__include
DEPDIR DEPDIR
am__leading_dot am__leading_dot
CC CC
I386_CPPFLAGS
INSTALL_DATA INSTALL_DATA
INSTALL_SCRIPT INSTALL_SCRIPT
INSTALL_PROGRAM INSTALL_PROGRAM
@ -2017,15 +2015,17 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
I386_CPPFLAGS=
case "$target" in case "$target" in
*coff) *coff)
IS_COFF="-DCOFF" I386_CPPFLAGS="-DCOFF"
;; ;;
*aout) *aout)
IS_AOUT="-DAOUT" I386_CPPFLAGS="-DAOUT"
;; ;;
esac esac
rm -rf .tst 2>/dev/null rm -rf .tst 2>/dev/null
mkdir .tst 2>/dev/null mkdir .tst 2>/dev/null
if test -d .tst; then if test -d .tst; then
@ -2449,9 +2449,6 @@ AR=${AR-ar}
LD=${LD-ld} LD=${LD-ld}
if test -n "$ac_tool_prefix"; then 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. # 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 set dummy ${ac_tool_prefix}ranlib; ac_word=$2

View File

@ -21,14 +21,16 @@ AC_ARG_PROGRAM
AC_PROG_INSTALL AC_PROG_INSTALL
I386_CPPFLAGS=
case "$target" in case "$target" in
*coff) *coff)
IS_COFF="-DCOFF" I386_CPPFLAGS="-DCOFF"
;; ;;
*aout) *aout)
IS_AOUT="-DAOUT" I386_CPPFLAGS="-DAOUT"
;; ;;
esac esac
AC_SUBST(I386_CPPFLAGS)
LIB_AC_PROG_CC LIB_AC_PROG_CC
AS=${AS-as} AS=${AS-as}
@ -37,9 +39,6 @@ AR=${AR-ar}
AC_SUBST(AR) AC_SUBST(AR)
LD=${LD-ld} LD=${LD-ld}
AC_SUBST(LD) AC_SUBST(LD)
AC_SUBST(IS_COFF)
AC_SUBST(IS_AOUT)
AC_SUBST(NEED_UNDERSCORE)
AC_PROG_RANLIB AC_PROG_RANLIB
LIB_AM_PROG_AS LIB_AM_PROG_AS