diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2007-01-11 11:22:52 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gnu.org> | 2007-01-11 11:22:52 +0000 |
| commit | df145479b9205174260519419ad72e97d4239de7 (patch) | |
| tree | df575ea5fedd304a23b1ff42a4c31a558d7e5f5d /Makefile.tpl | |
| parent | da81b8381d128dbcce4ab40df5a540ed58d9ca6b (diff) | |
| download | binutils-redhat-df145479b9205174260519419ad72e97d4239de7.tar.gz | |
2007-01-11 Paolo Bonzini <bonzini@gnu.org>
Nick Clifton <nickc@redhat.com>
Kaveh R. Ghazi <ghazi@caip.rutgets.edu>
* configure.in (build_configargs, host_configargs, target_configargs):
Remove build/host/target parameters.
(host_libs): Add gmp and mpfr.
(GMP tests): Reorganize to allow in-tree GMP/MPFR.
* Makefile.def (gmp, mpfr): New.
(gcc): Remove target.
* Makefile.tpl (build_os, build_vendor, host_os, host_vendor,
target_os, target_vendor): New.
(configure): Add host_alias/target_alias arguments. Adjust invocations.
* configure: Regenerate.
* Makefile.in: Regenerate.
2007-01-11 Matt Fago <fago@earthlink.net>
* configure.in: Try to link to functions only in mpfr 2.2.x
to improve robustness of configure tests.
* configure: Regenerate.
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 2d4fe074d2..475b0d358e 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -29,10 +29,16 @@ in VPATH=@srcdir@ build_alias=@build_alias@ +build_vendor=@build_vendor@ +build_os=@build_os@ build=@build@ host_alias=@host_alias@ +host_vendor=@host_vendor@ +host_os=@host_os@ host=@host@ target_alias=@target_alias@ +target_vendor=@target_vendor@ +target_os=@target_os@ target=@target@ program_transform_name = @program_transform_name@ @@ -779,7 +785,8 @@ configure-[+prefix+][+module+]: [+ IF bootstrap +][+ ELSE +] libsrcdir="$$s/[+module+]"; \ [+ IF no-config-site +]rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file [+ ENDIF +]$(SHELL) $${libsrcdir}/configure \ - [+args+] $${srcdiroption} [+extra_configure_flags+] \ + [+args+] --build=${build_alias} --host=[+host_alias+] \ + --target=[+target_alias+] $${srcdiroption} [+extra_configure_flags+] \ || exit 1 @endif [+prefix+][+module+] @@ -821,7 +828,8 @@ configure-stage[+id+]-[+prefix+][+module+]: srcdiroption="--srcdir=$${topdir}/[+module+]"; \ libsrcdir="$$s/[+module+]"; \ $(SHELL) $${libsrcdir}/configure \ - [+args+] $${srcdiroption} \ + [+args+] --build=${build_alias} --host=[+host_alias+] \ + --target=[+target_alias+] $${srcdiroption} \ [+ IF prev +]--with-build-libsubdir=$(HOST_SUBDIR)[+ ENDIF prev +] \ [+stage_configure_flags+] [+extra_configure_flags+] @endif [+prefix+][+module+]-bootstrap @@ -837,7 +845,7 @@ all-[+prefix+][+module+]: stage_current @endif gcc-bootstrap @if [+prefix+][+module+] TARGET-[+prefix+][+module+]=[+ - IF target +][+target+][+ ELSE +]all[+ ENDIF target +] + IF all_target +][+all_target+][+ ELSE +]all[+ ENDIF all_target +] maybe-all-[+prefix+][+module+]: all-[+prefix+][+module+] all-[+prefix+][+module+]: configure-[+prefix+][+module+][+ IF bootstrap +][+ ELSE +] @: $(MAKE); $(unstage)[+ ENDIF bootstrap +] @@ -894,6 +902,8 @@ clean-stage[+id+]-[+prefix+][+module+]: # -------------------------------------- [+ FOR build_modules +] [+ configure prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" + host_alias=(get "host" "${build_alias}") + target_alias=(get "target" "${target_alias}") args="$(BUILD_CONFIGARGS)" no-config-site=true +] [+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +] @@ -906,6 +916,8 @@ clean-stage[+id+]-[+prefix+][+module+]: [+ configure prefix="" subdir="$(HOST_SUBDIR)" exports="$(HOST_EXPORTS)" poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)" + host_alias=(get "host" "${host_alias}") + target_alias=(get "target" "${target_alias}") args="$(HOST_CONFIGARGS)" +] [+ all prefix="" subdir="$(HOST_SUBDIR)" @@ -1003,6 +1015,8 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+] [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)" check_multilibs=true exports="$(RAW_CXX_TARGET_EXPORTS)" + host_alias=(get "host" "${target_alias}") + target_alias=(get "target" "${target_alias}") args="$(TARGET_CONFIGARGS)" no-config-site=true +] [+ all prefix="target-" subdir="$(TARGET_SUBDIR)" @@ -1012,6 +1026,8 @@ maybe-[+make_target+]-[+module+]: [+make_target+]-[+module+] [+ configure prefix="target-" subdir="$(TARGET_SUBDIR)" check_multilibs=true exports="$(NORMAL_TARGET_EXPORTS)" + host_alias=(get "host" "${target_alias}") + target_alias=(get "target" "${target_alias}") args="$(TARGET_CONFIGARGS)" no-config-site=true +] [+ all prefix="target-" subdir="$(TARGET_SUBDIR)" |