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 <oliva@dcc.unicamp.br> * 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
This commit is contained in:
parent
5ddbf40f38
commit
5cb95c7ac4
12
ChangeLog
12
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 <oliva@dcc.unicamp.br>
|
||||||
|
|
||||||
|
* 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 <pfeifer@dbai.tuwien.ac.at>
|
Tue Sep 1 16:23:11 1998 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
|
||||||
|
|
||||||
* README: Remove installation instructions and refer to the
|
* README: Remove installation instructions and refer to the
|
||||||
|
21
Makefile.in
21
Makefile.in
@ -36,7 +36,9 @@ oldincludedir=/usr/include
|
|||||||
infodir=${prefix}/info
|
infodir=${prefix}/info
|
||||||
mandir=${prefix}/man
|
mandir=${prefix}/man
|
||||||
|
|
||||||
tooldir = $(exec_prefix)/$(target)
|
tooldir = $(exec_prefix)/$(target_alias)
|
||||||
|
build_tooldir = $(exec_prefix)/$(target_alias)
|
||||||
|
|
||||||
|
|
||||||
program_transform_name =
|
program_transform_name =
|
||||||
|
|
||||||
@ -207,12 +209,12 @@ CC_FOR_TARGET = ` \
|
|||||||
if [ -f $$r/gcc/xgcc ] ; then \
|
if [ -f $$r/gcc/xgcc ] ; then \
|
||||||
if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
|
if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
|
||||||
if [ -f $$r/$(TARGET_SUBDIR)/winsup/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 \
|
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; \
|
fi; \
|
||||||
else \
|
else \
|
||||||
echo $$r/gcc/xgcc -B$$r/gcc/; \
|
echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/; \
|
||||||
fi; \
|
fi; \
|
||||||
else \
|
else \
|
||||||
if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
|
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
|
# 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
|
# build libgcc2.a. We define it here so that it can itself be
|
||||||
# overridden on the command line.
|
# 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 = ` \
|
CHILL_FOR_TARGET = ` \
|
||||||
if [ -f $$r/gcc/xgcc ] ; then \
|
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 \
|
else \
|
||||||
if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
|
if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
|
||||||
echo $(CC); \
|
echo $(CC); \
|
||||||
@ -243,12 +245,12 @@ CXX_FOR_TARGET = ` \
|
|||||||
if [ -f $$r/gcc/xgcc ] ; then \
|
if [ -f $$r/gcc/xgcc ] ; then \
|
||||||
if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
|
if [ -f $$r/$(TARGET_SUBDIR)/newlib/Makefile ] ; then \
|
||||||
if [ -f $$r/$(TARGET_SUBDIR)/winsup/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 \
|
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; \
|
fi; \
|
||||||
else \
|
else \
|
||||||
echo $$r/gcc/xgcc -B$$r/gcc/; \
|
echo $$r/gcc/xgcc -B$$r/gcc/ -B$(build_tooldir)/bin/; \
|
||||||
fi; \
|
fi; \
|
||||||
else \
|
else \
|
||||||
if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
|
if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
|
||||||
@ -409,6 +411,7 @@ BASE_FLAGS_TO_PASS = \
|
|||||||
"sharedstatedir=$(sharedstatedir)" \
|
"sharedstatedir=$(sharedstatedir)" \
|
||||||
"sysconfdir=$(sysconfdir)" \
|
"sysconfdir=$(sysconfdir)" \
|
||||||
"tooldir=$(tooldir)" \
|
"tooldir=$(tooldir)" \
|
||||||
|
"build_tooldir=$(build_tooldir)" \
|
||||||
"gxx_include_dir=$(gxx_include_dir)" \
|
"gxx_include_dir=$(gxx_include_dir)" \
|
||||||
"gcc_version=$(gcc_version)" \
|
"gcc_version=$(gcc_version)" \
|
||||||
"gcc_version_trigger=$(gcc_version_trigger)" \
|
"gcc_version_trigger=$(gcc_version_trigger)" \
|
||||||
|
Loading…
Reference in New Issue
Block a user