aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPer Bothner <per@bothner.com>1995-10-30 20:57:41 +0000
committerPer Bothner <per@bothner.com>1995-10-30 20:57:41 +0000
commite66eb6584365622ba3bc9f7bfa931a6339d95fa5 (patch)
tree5f527048fa7aa8e3980880d7418b6c91d731894b
parentfc3524a9cce6eba2b1f05ea064a6d51e9836a3c4 (diff)
downloadgdb-e66eb6584365622ba3bc9f7bfa931a6339d95fa5.zip
gdb-e66eb6584365622ba3bc9f7bfa931a6339d95fa5.tar.gz
gdb-e66eb6584365622ba3bc9f7bfa931a6339d95fa5.tar.bz2
* Makefile.in (CC_FOR_TARGET, CXX_FOR_TARGET): Add $(TARGET_SUBDIR)
where needed.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in14
2 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 76545c3..ee6e0f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 30 12:27:16 1995 Per Bothner <bothner@kalessin.cygnus.com>
+
+ * Makefile.in (CC_FOR_TARGET, CXX_FOR_TARGET): Add $(TARGET_SUBDIR)
+ where needed.
+
Mon Oct 30 12:45:25 1995 Doug Evans <dje@cygnus.com>
* Makefile.in (all-gcc): Fix typo.
diff --git a/Makefile.in b/Makefile.in
index fe93933..b9dff25 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 \