diff options
| -rw-r--r-- | rules/e2fsprogs.make | 6 | ||||
| -rw-r--r-- | rules/fbtest.make | 4 | ||||
| -rw-r--r-- | rules/hosttool-e2fsprogs.make | 4 | ||||
| -rw-r--r-- | rules/lilo.make | 2 | ||||
| -rw-r--r-- | rules/mtd.make | 2 | ||||
| -rw-r--r-- | rules/xfree430.make | 8 |
6 files changed, 14 insertions, 12 deletions
diff --git a/rules/e2fsprogs.make b/rules/e2fsprogs.make index b79934894..635790e40 100644 --- a/rules/e2fsprogs.make +++ b/rules/e2fsprogs.make @@ -65,8 +65,10 @@ e2fsprogs_prepare: $(STATEDIR)/e2fsprogs.prepare E2FSPROGS_AUTOCONF = $(CROSS_AUTOCONF) E2FSPROGS_AUTOCONF += --prefix=/usr E2FSPROGS_AUTOCONF += --enable-fsck -E2FSPROGS_AUTOCONF += --with-cc=$(PTXCONF_COMPILER_PREFIX)gcc -E2FSPROGS_AUTOCONF += --with-linker=$(PTXCONF_COMPILER_PREFIX)ld +ifndef NATIVE +E2FSPROGS_AUTOCONF += --with-cc=$(COMPILER_PREFIX)gcc +E2FSPROGS_AUTOCONF += --with-linker=$(COMPILER_PREFIX)ld +endif E2FSPROGS_PATH = PATH=$(CROSS_PATH) E2FSPROGS_ENV = $(CROSS_ENV) E2FSPROGS_ENV += BUILD_CC=$(HOSTCC) diff --git a/rules/fbtest.make b/rules/fbtest.make index 8368717a1..c780e941f 100644 --- a/rules/fbtest.make +++ b/rules/fbtest.make @@ -90,7 +90,7 @@ fbtest_compile_deps = $(STATEDIR)/fbtest.prepare $(STATEDIR)/fbtest.compile: $(fbtest_compile_deps) @$(call targetinfo, $@) cd $(FBTEST_DIR) && $(FBTEST_ENV) $(FBTEST_PATH) \ - CROSS_COMPILE=$(PTXCONF_COMPILER_PREFIX) make + CROSS_COMPILE=$(COMPILER_PREFIX) make touch $@ # ---------------------------------------------------------------------------- @@ -123,7 +123,7 @@ $(STATEDIR)/fbtest.targetinstall: $(fbtest_targetinstall_deps) @$(call install_fixup,DEPENDS,) @$(call install_fixup,DESCRIPTION,missing) - @$(call install_copy, 0, 0, 0755, $(FBTEST_DIR)/$(PTXCONF_COMPILER_PREFIX)fbtest, /sbin/fbtest) + @$(call install_copy, 0, 0, 0755, $(FBTEST_DIR)/$(COMPILER_PREFIX)fbtest, /sbin/fbtest) @$(call install_finish) diff --git a/rules/hosttool-e2fsprogs.make b/rules/hosttool-e2fsprogs.make index 7fdd55b31..36ca093f1 100644 --- a/rules/hosttool-e2fsprogs.make +++ b/rules/hosttool-e2fsprogs.make @@ -67,8 +67,8 @@ hosttool-e2fsprogs_prepare: $(STATEDIR)/hosttool-e2fsprogs.prepare HOSTTOOLS_E2FSPROGS_AUTOCONF = $(CROSS_AUTOCONF) HOSTTOOLS_E2FSPROGS_AUTOCONF += --prefix=/usr HOSTTOOLS_E2FSPROGS_AUTOCONF += --enable-fsck -HOSTTOOLS_E2FSPROGS_AUTOCONF += --with-cc=$(PTXCONF_COMPILER_PREFIX)gcc -HOSTTOOLS_E2FSPROGS_AUTOCONF += --with-linker=$(PTXCONF_COMPILER_PREFIX)ld +HOSTTOOLS_E2FSPROGS_AUTOCONF += --with-cc=$(COMPILER_PREFIX)gcc +HOSTTOOLS_E2FSPROGS_AUTOCONF += --with-linker=$(COMPILER_PREFIX)ld HOSTTOOLS_E2FSPROGS_PATH = PATH=$(CROSS_PATH) HOSTTOOLS_E2FSPROGS_ENV = $(CROSS_ENV) HOSTTOOLS_E2FSPROGS_ENV += BUILD_CC=$(HOSTCC) diff --git a/rules/lilo.make b/rules/lilo.make index 1f524f9cb..f6b705cb0 100644 --- a/rules/lilo.make +++ b/rules/lilo.make @@ -63,7 +63,7 @@ $(STATEDIR)/lilo.extract: $(STATEDIR)/lilo.get lilo_prepare: $(STATEDIR)/lilo.prepare LILO_PATH = PATH=$(CROSS_PATH) -LILO_MAKEVARS = CROSS=$(PTXCONF_COMPILER_PREFIX) +LILO_MAKEVARS = CROSS=$(COMPILER_PREFIX) # # dependencies diff --git a/rules/mtd.make b/rules/mtd.make index 35bef1a9b..ac963ca06 100644 --- a/rules/mtd.make +++ b/rules/mtd.make @@ -73,7 +73,7 @@ mtd_prepare_deps = \ $(STATEDIR)/mtd.extract MTD_PATH = PATH=$(CROSS_PATH) -MTD_MAKEVARS = CROSS=$(PTXCONF_COMPILER_PREFIX) +MTD_MAKEVARS = CROSS=$(COMPILER_PREFIX) MTD_ENV = $(CROSS_ENV) $(STATEDIR)/mtd.prepare: $(mtd_prepare_deps) diff --git a/rules/xfree430.make b/rules/xfree430.make index aced39a8b..1e0d89b90 100644 --- a/rules/xfree430.make +++ b/rules/xfree430.make @@ -141,11 +141,11 @@ $(STATEDIR)/xfree430.prepare: $(xfree430_prepare_deps) cp $(PTXCONF_XFREE430_CONFIG) $(XFREE430_BUILDDIR)/config/cf/host.def cd $(XFREE430_BUILDDIR) && mkdir cross_compiler for i in $(PTXCONF_PREFIX)/$(PTXCONF_GNU_TARGET)/bin/*; do ln -s $$i $(XFREE430_BUILDDIR)/cross_compiler; done - ln -sf $(PTXCONF_PREFIX)/bin/$(PTXCONF_COMPILER_PREFIX)cpp $(XFREE430_BUILDDIR)/cross_compiler/cpp - ln -sf $(PTXCONF_PREFIX)/bin/$(PTXCONF_COMPILER_PREFIX)gcov $(XFREE430_BUILDDIR)/cross_compiler/gcov + ln -sf $(PTXCONF_PREFIX)/bin/$(COMPILER_PREFIX)cpp $(XFREE430_BUILDDIR)/cross_compiler/cpp + ln -sf $(PTXCONF_PREFIX)/bin/$(COMPILER_PREFIX)gcov $(XFREE430_BUILDDIR)/cross_compiler/gcov ln -sf gcc $(XFREE430_BUILDDIR)/cross_compiler/cc - ln -sf $(PTXCONF_PREFIX)/bin/$(PTXCONF_COMPILER_PREFIX)g++ $(XFREE430_BUILDDIR)/cross_compiler/ - ln -sf $(PTXCONF_COMPILER_PREFIX)g++ $(XFREE430_BUILDDIR)/cross_compiler/g++ + ln -sf $(PTXCONF_PREFIX)/bin/$(COMPILER_PREFIX)g++ $(XFREE430_BUILDDIR)/cross_compiler/ + ln -sf $(COMPILER_PREFIX)g++ $(XFREE430_BUILDDIR)/cross_compiler/g++ ln -sf g++ $(XFREE430_BUILDDIR)/cross_compiler/c++ touch $@ |