From 5cb95c7ac4a78b7b639801dad07c2f66448ffc48 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 12 Oct 1998 05:11:16 -0600 Subject: [PATCH] Makefile.in (CHILL_FOR_TARGET): Mirror recent changes to CC_FOR_TARGET and friends. * Makefile.in (CHILL_FOR_TARGET): Mirror recent changes to CC_FOR_TARGET and friends. Mon Oct 12 12:09:30 1998 Alexandre Oliva * Makefile.in (build_tooldir): new variable, same as tooldir (CC_FOR_TARGET, GCC_FOR_TARGET, CXX_FOR_TARGET): add -B$(build_tooldir)/bin/ (BASE_FLAGS_TO_PASS): pass build_tooldir down From-SVN: r23016 --- ChangeLog | 12 ++++++++++++ Makefile.in | 21 ++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 890ca88..a16faf7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Mon Oct 12 12:09:44 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (CHILL_FOR_TARGET): Mirror recent changes to + CC_FOR_TARGET and friends. + +Mon Oct 12 12:09:30 1998 Alexandre Oliva + + * Makefile.in (build_tooldir): new variable, same as tooldir + (CC_FOR_TARGET, GCC_FOR_TARGET, CXX_FOR_TARGET): add + -B$(build_tooldir)/bin/ + (BASE_FLAGS_TO_PASS): pass build_tooldir down + Tue Sep 1 16:23:11 1998 Gerald Pfeifer * README: Remove installation instructions and refer to the diff --git a/Makefile.in b/Makefile.in index 383852c..b3d5573 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,7 +36,9 @@ oldincludedir=/usr/include infodir=${prefix}/info mandir=${prefix}/man -tooldir = $(exec_prefix)/$(target) +tooldir = $(exec_prefix)/$(target_alias) +build_tooldir = $(exec_prefix)/$(target_alias) + program_transform_name = @@ -207,12 +209,12 @@ CC_FOR_TARGET = ` \ if [ -f $$r/gcc/xgcc ] ; then \ if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \ if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \ - echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/$(TARGET_SUBDIR)/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ else \ - echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ fi; \ else \ - echo $$r/gcc/xgcc -B$$r/gcc/; \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/; \ fi; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ @@ -226,11 +228,11 @@ CC_FOR_TARGET = ` \ # variable is passed down to the gcc Makefile, where it is used to # build libgcc2.a. We define it here so that it can itself be # overridden on the command line. -GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/ +GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ CHILL_FOR_TARGET = ` \ if [ -f $$r/gcc/xgcc ] ; then \ - echo $$r/gcc/xgcc -B$$r/gcc/ -L$$r/gcc/ch/runtime/; \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -L$$r/gcc/ch/runtime/; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(CC); \ @@ -243,12 +245,12 @@ CXX_FOR_TARGET = ` \ if [ -f $$r/gcc/xgcc ] ; then \ if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \ if [ -f $$r/$(TARGET_SUBDIR)/winsup/Makefile ] ; then \ - echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$$r/$(TARGET_SUBDIR)/newlib/ -B$(build_tooldir)/bin/ -L$$r/winsup -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ else \ - echo $$r/gcc/xgcc -B$$r/gcc/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/ -idirafter $$r/$(TARGET_SUBDIR)/newlib/targ-include -idirafter $$s/newlib/libc/include -nostdinc; \ fi; \ else \ - echo $$r/gcc/xgcc -B$$r/gcc/; \ + echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/; \ fi; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ @@ -409,6 +411,7 @@ BASE_FLAGS_TO_PASS = \ "sharedstatedir=$(sharedstatedir)" \ "sysconfdir=$(sysconfdir)" \ "tooldir=$(tooldir)" \ + "build_tooldir=$(build_tooldir)" \ "gxx_include_dir=$(gxx_include_dir)" \ "gcc_version=$(gcc_version)" \ "gcc_version_trigger=$(gcc_version_trigger)" \ -- 2.7.4