From: Per Bothner Date: Mon, 30 Oct 1995 20:57:41 +0000 (+0000) Subject: * Makefile.in (CC_FOR_TARGET, CXX_FOR_TARGET): Add $(TARGET_SUBDIR) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e66eb6584365622ba3bc9f7bfa931a6339d95fa5;p=binutils-gdb.git * Makefile.in (CC_FOR_TARGET, CXX_FOR_TARGET): Add $(TARGET_SUBDIR) where needed. --- diff --git a/ChangeLog b/ChangeLog index 76545c3b979..ee6e0f0c5f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 30 12:27:16 1995 Per Bothner + + * Makefile.in (CC_FOR_TARGET, CXX_FOR_TARGET): Add $(TARGET_SUBDIR) + where needed. + Mon Oct 30 12:45:25 1995 Doug Evans * Makefile.in (all-gcc): Fix typo. diff --git a/Makefile.in b/Makefile.in index fe9393318a3..b9dff25053b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -134,6 +134,9 @@ OTHERS = # should be built using the target tools. TARGET_CONFIGDIRS = libiberty libgloss newlib libio librx libstdc++ libg++ winsup +# Target libraries are put under this directory: +TARGET_SUBDIR = . # Changed by configure to $(target_alias) if cross. + # This is set by the configure script to the arguments passed to configure. CONFIG_ARGUMENTS = @@ -148,8 +151,8 @@ INSTALL_TARGET = install-dirs \ CC_FOR_TARGET = ` \ if [ -f $$r/gcc/Makefile ] ; then \ - if [ -f $$r/newlib/Makefile ] ; then \ - echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \ + if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \ + echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \ else \ echo $$r/gcc/xgcc -B$$r/gcc/; \ fi; \ @@ -177,8 +180,8 @@ CHILL_FOR_TARGET = ` \ CXX_FOR_TARGET = ` \ if [ -f $$r/gcc/Makefile ] ; then \ - if [ -f $$r/newlib/Makefile ] ; then \ - echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \ + if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \ + echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $${srcroot}/newlib/libc/include -nostdinc; \ else \ echo $$r/gcc/xgcc -B$$r/gcc/; \ fi; \ @@ -592,9 +595,6 @@ CHECK_TARGET_MODULES = \ # This is a list of the install targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). -CROSS=native # or CROSS=cross -# Target libraries are put under this directory: -TARGET_SUBDIR = . # Changed by configure to $(target_alias) if cross. INSTALL_TARGET_MODULES = \ install-target-libio \