aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Chupin <pavel.v.chupin@intel.com>2014-04-03 18:46:35 +0400
committerPavel Chupin <pavel.v.chupin@intel.com>2014-04-03 19:22:30 +0400
commit37a13a99617dfd1c9995a41ff2734acd0957de79 (patch)
tree1dc7127b193d468c36533a5035c3761ee7af7d5b
parentccf7c394c02f03c0674bd86844e807cbc725eda0 (diff)
downloadbuild-37a13a99617dfd1c9995a41ff2734acd0957de79.tar.gz
Avoid host toolchain copy to target toolchain dir in canadian build
After https://android-review.googlesource.com/#/c/88662/ in mingw build host toolchain put into the same directory as target. This patch fixes this issue. Change-Id: I8cb08fdfc9f8a3eb1b88ba982ebeb79c851b25d8 Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
-rw-r--r--Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 9c17c95..94e2eaa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -255,7 +255,7 @@ stmp-config-canadian-tools:
($(canadian_build_env) \
cd $(CANADIAN_ROOT) && \
$(abs_srcdir)/configure $(baseargs) --with-gdb-version=none --build=$(cur_build) \
- --host=$(cur_build) --target=$(cur_target)) && \
+ --host=$(cur_build) --target=$(cur_target) --prefix=$(CANADIAN_ROOT)/install) && \
$(STAMP) $@
build-canadian-tools: stmp-build-canadian-tools
@@ -269,7 +269,7 @@ install-canadian-tools: stmp-install-canadian-tools
stmp-install-canadian-tools: stmp-build-canadian-tools
($(canadian_build_env) \
cd $(CANADIAN_ROOT) && \
- $(MAKE) -j1 install prefix=$(CANADIAN_ROOT)/install) && \
+ $(MAKE) -j1 install) && \
$(STAMP) $@
# When building canadian cross toolchain we cannot build GCC target libraries.
@@ -804,10 +804,10 @@ stmp-config-target-gdb: config.status $(canadian_stmp)
$(GDB_CONFIG_ARGS)) && \
$(STAMP) $@
build-target-gdb: stmp-build-target-gdb
-stmp-build-target-gdb: stmp-config-target-gdb
+stmp-build-target-gdb: stmp-config-target-gdb install-target-binutils
($(canadian_env) \
$(MAKE) -C ${GDB_VERSION}) && $(STAMP) $@
-install-target-gdb: stmp-build-target-gdb install-target-binutils
+install-target-gdb: stmp-build-target-gdb
($(canadian_env) \
$(MAKE) -C ${GDB_VERSION} install)
endif