diff options
author | Mike Frysinger <vapier@gentoo.org> | 2022-02-08 23:53:13 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-02-09 20:00:43 -0500 |
commit | a49c5fcdb5423983e44567a1c23145fd9fb6e527 (patch) | |
tree | 041d0b18bb54ea16c2e4ca819c8df832daa05aaf /libgloss | |
parent | 401e68c664fe1e8377ef7f8ab59d5ab4a13942da (diff) | |
download | newlib-a49c5fcdb5423983e44567a1c23145fd9fb6e527.zip newlib-a49c5fcdb5423983e44567a1c23145fd9fb6e527.tar.gz newlib-a49c5fcdb5423983e44567a1c23145fd9fb6e527.tar.bz2 |
libgloss: m68k: rename $DO to $TARGET
The common $DO variable is used by the multilib logic to control which
target to multiplex. But the m68k subdir is also using $DO to control
which target (m68k or fido) to build. As we flatten things to automake,
this conflict shows up and breaks the m68k build. Just rename the m68k
variable to something unique to avoid it.
Diffstat (limited to 'libgloss')
-rw-r--r-- | libgloss/m68k/Makefile.in | 6 | ||||
-rwxr-xr-x | libgloss/m68k/configure | 12 | ||||
-rw-r--r-- | libgloss/m68k/configure.ac | 10 |
3 files changed, 14 insertions, 14 deletions
diff --git a/libgloss/m68k/Makefile.in b/libgloss/m68k/Makefile.in index b9452ba..42cf2b2 100644 --- a/libgloss/m68k/Makefile.in +++ b/libgloss/m68k/Makefile.in @@ -69,7 +69,7 @@ OBJS = close.o fstat.o getpid.o isatty.o kill.o \ unlink.o write.o # What targets to build for. This is a list of {m68k,cf} -DO = @DO@ +TARGET = @TARGET@ # Here is all of the simulator stuff SIM_SCRIPTS = sim.ld @@ -200,7 +200,7 @@ HOSTED_OBJS= hosted-gdb.o hosted-exit.o $(patsubst un%,%,$(UNHOSTED_OBJS)) # Host specific makefile fragment comes in here. @host_makefile_frag@ -all :: $(DO:%=all_%) +all :: $(TARGET:%=all_%) # # here's where we build the board support packages for each target @@ -406,7 +406,7 @@ dtor.x: dtor.o ${CRT0} ${srcdir}/mvme135.ld Makefile ${MVME135_BSP} unlink.o: $(srcdir)/../unlink.c .PHONY: install info dvi doc install-info clean-info -install:: $(DO:%=install_%) +install:: $(TARGET:%=install_%) .PHONY:install_m68k diff --git a/libgloss/m68k/configure b/libgloss/m68k/configure index 2a9d3f2..f5ecb82 100755 --- a/libgloss/m68k/configure +++ b/libgloss/m68k/configure @@ -587,7 +587,7 @@ LIBOBJS multi_basedir target_makefile_frag_path host_makefile_frag_path -DO +TARGET CPP OBJEXT EXEEXT @@ -2600,7 +2600,7 @@ test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking target cpu family" >&5 $as_echo_n "checking target cpu family... " >&6; } -DO=m68k +TARGET=m68k saved_LDFLAGS="$LDFLAGS" LDFLAGS="-nostdlib -e main" ac_ext=c @@ -3545,7 +3545,7 @@ main () } _ACEOF if ac_fn_c_try_cpp "$LINENO"; then : - DO="cf" + TARGET="cf" fi rm -f conftest.err conftest.i conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3562,12 +3562,12 @@ main () } _ACEOF if ac_fn_c_try_cpp "$LINENO"; then : - DO="fido" + TARGET="fido" fi rm -f conftest.err conftest.i conftest.$ac_ext LDFLAGS=$saved_LDFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DO" >&5 -$as_echo "$DO" >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $TARGET" >&5 +$as_echo "$TARGET" >&6; } host_makefile_frag=${srcdir}/../config/default.mh diff --git a/libgloss/m68k/configure.ac b/libgloss/m68k/configure.ac index de35d79..41b49a5 100644 --- a/libgloss/m68k/configure.ac +++ b/libgloss/m68k/configure.ac @@ -31,7 +31,7 @@ AC_PROG_RANLIB LIB_AM_PROG_AS AC_MSG_CHECKING([target cpu family]) -DO=m68k +TARGET=m68k dnl Temporarily modify LDFLAGS so that link tests will succeed without dnl a C library. Note that we may not have a C librabry yet and that dnl autoconf automatically adds script to check whether we can create @@ -42,14 +42,14 @@ LDFLAGS="-nostdlib -e main" AC_PREPROC_IFELSE([AC_LANG_PROGRAM([#ifndef __mcoldfire__ #error we are not coldfire #endif])], - DO="cf",) + TARGET="cf",) AC_PREPROC_IFELSE([AC_LANG_PROGRAM([#ifndef __mfido__ #error we are not fido #endif])], - DO="fido",) + TARGET="fido",) LDFLAGS=$saved_LDFLAGS -AC_MSG_RESULT($DO) -AC_SUBST(DO) +AC_MSG_RESULT($TARGET) +AC_SUBST(TARGET) host_makefile_frag=${srcdir}/../config/default.mh target_makefile_frag=${srcdir}/../config/default.mt |