summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-06-05 21:49:44 +0000
committerPaul Mundt <lethal@linux-sh.org>2006-06-05 21:49:44 +0000
commitd56e2b342f29df43839f684b977879ca8718c0e8 (patch)
tree6bc7873f8fe6b073aad879445591a22c570175f8
parentc1eb4cdc6fa205b20e3494426a4430fa266f5038 (diff)
Split the target suffix out as a config option, for the few cases where
we have to use a different one.
-rw-r--r--Config.in12
-rw-r--r--package/Makefile.in7
2 files changed, 16 insertions, 3 deletions
diff --git a/Config.in b/Config.in
index 41761f5e7..04b46dac7 100644
--- a/Config.in
+++ b/Config.in
@@ -236,6 +236,18 @@ config BR2_GNU_BUILD_SUFFIX
cygwin: pc-cygwin
os x: apple-darwin7 / apple-darwin8
+config BR2_GNU_TARGET_SUFFIX
+ string "GNU target suffix"
+ default "linux-uclibc"
+ help
+ The string used to pass to configure scripts via the
+ --target= option. Just specify the suffix here, the leading
+ arch will be filled in automatically.
+
+ Most users will want to stick with the default setting, though
+ other users (most notably ARM EABI) like to add on to this in
+ order to stay in line with gcc conventions.
+
config BR2_JLEVEL
int "Number of jobs to run simultaneously"
default "1"
diff --git a/package/Makefile.in b/package/Makefile.in
index 6f3cbb71f..595d8625d 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -38,15 +38,16 @@ BUILD_DIR:=$(BASE_DIR)/$(TOPDIR_PREFIX)build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_S
TARGET_DIR:=$(BUILD_DIR)/root
TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
+GNU_TARGET_SUFFIX:=-$(strip $(subst ",, $(BR2_GNU_TARGET_SUFFIX)))
# Strip off the annoying quoting
STAGING_DIR:=$(strip $(subst ",, $(BR2_STAGING_DIR)))
#"
TARGET_PATH=$(STAGING_DIR)/bin:$(TOOL_BUILD_DIR)/bin:/bin:/sbin:/usr/bin:/usr/sbin
IMAGE:=$(BASE_DIR)/rootfs.$(ARCH)$(ARCH_FPU_SUFFIX)
-REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux-uclibc
+REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
-KERNEL_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
-TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)-linux-uclibc-
+KERNEL_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)-
+TARGET_CROSS=$(STAGING_DIR)/bin/$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)-
TARGET_CC=$(TARGET_CROSS)gcc
TARGET_CXX=$(TARGET_CROSS)g++
TARGET_RANLIB=$(TARGET_CROSS)ranlib