diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-08-22 07:36:13 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-08-22 09:38:56 +0200 |
| commit | a80493c903fcda67e7b7fbe81ffb1e563d86efd2 (patch) | |
| tree | fcf202a310b2214b76431aff2040755a340c6871 /Makefile.in | |
| parent | f9da6a5b76a6e499256a875fdf74f69eefd2a837 (diff) | |
Always go through the cross_toolset build.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in index 126056746978..682037233587 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,20 +8,21 @@ else GBUILD_OPT:=--gmake endif -all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded cross-build-toolset.built +ifeq (@CROSS_COMPILING@,YES) +CROSS_TOOLSET_RULE:=cross-build-toolset +else +CROSS_TOOLSET_RULE:= +endif + +all: Makefile dmake/dmake@EXEEXT_FOR_BUILD@ src.downloaded $(CROSS_TOOLSET_RULE) @. ./Env.Host.sh && \ cd instsetoo_native && \ build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ -cross-build-toolset.built: -ifeq (@CROSS_COMPILING@,YES) +cross-build-toolset: @. ./Env.Build.sh && \ cd cross_toolset && \ - build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ && \ - touch $@ -else - touch $@ -endif + build.pl $(GBUILD_OPT) -P@BUILD_NCPUS@ --all -- -P@BUILD_MAX_JOBS@ install: @. ./Env.Host.sh && \ @@ -80,7 +81,6 @@ endif dmake/dmake@EXEEXT_FOR_BUILD@: ./bootstrap - -rm -f cross-build-toolset.built src.downloaded: ooo.lst download ifeq (@DO_FETCH_TARBALLS@,YES) |