mirror of
https://git.busybox.net/buildroot.git
synced 2025-01-18 18:33:52 +08:00
Guess build system and remove BR2_GNU_BUILD_SUFFIX
Instead of having a configuration option BR2_GNU_BUILD_SUFFIX, let's use config.guess to guess the build system type. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
parent
bc59823bd5
commit
60281cbfe4
13
Config.in
13
Config.in
@ -103,19 +103,6 @@ config BR2_STAGING_DIR
|
||||
|
||||
source "target/device/Config.in.mirrors"
|
||||
|
||||
config BR2_GNU_BUILD_SUFFIX
|
||||
string "GNU build hostname suffix"
|
||||
default "pc-linux-gnu"
|
||||
help
|
||||
The string used to pass to configure scripts via the
|
||||
--build= option. Just specify the suffix here, the leading
|
||||
arch will be filled in automatically.
|
||||
|
||||
Here's some copy and paste build host options for you:
|
||||
linux: pc-linux-gnu
|
||||
cygwin: pc-cygwin
|
||||
os x: apple-darwin7 / apple-darwin8
|
||||
|
||||
config BR2_GNU_TARGET_SUFFIX
|
||||
string "GNU target suffix"
|
||||
default "linux-uclibcgnueabi" if BR2_ARM_EABI
|
||||
|
10
Makefile
10
Makefile
@ -153,29 +153,31 @@ cc-option=$(shell if $(TARGET_CC) $(TARGET_CFLAGS) $(1) -S -o /dev/null -xc /dev
|
||||
unexport CROSS_COMPILE
|
||||
unexport ARCH
|
||||
|
||||
GNU_HOST_NAME=$(shell package/gnuconfig/config.guess)
|
||||
|
||||
#############################################################
|
||||
#
|
||||
# Setup the proper filename extensions for the host
|
||||
#
|
||||
##############################################################
|
||||
ifneq ($(findstring linux,$(BR2_GNU_BUILD_SUFFIX)),)
|
||||
ifneq ($(findstring linux,$(GNU_HOST_NAME)),)
|
||||
HOST_EXEEXT:=
|
||||
HOST_LIBEXT:=.a
|
||||
HOST_SHREXT:=.so
|
||||
endif
|
||||
ifneq ($(findstring apple,$(BR2_GNU_BUILD_SUFFIX)),)
|
||||
ifneq ($(findstring apple,$(GNU_HOST_NAME)),)
|
||||
HOST_EXEEXT:=
|
||||
HOST_LIBEXT:=.a
|
||||
HOST_SHREXT:=.dylib
|
||||
endif
|
||||
ifneq ($(findstring cygwin,$(BR2_GNU_BUILD_SUFFIX)),)
|
||||
ifneq ($(findstring cygwin,$(GNU_HOST_NAME)),)
|
||||
HOST_EXEEXT:=.exe
|
||||
HOST_LIBEXT:=.lib
|
||||
HOST_SHREXT:=.dll
|
||||
HOST_LOADLIBES="-lcurses -lintl"
|
||||
export HOST_LOADLIBES
|
||||
endif
|
||||
ifneq ($(findstring mingw,$(BR2_GNU_BUILD_SUFFIX)),)
|
||||
ifneq ($(findstring mingw,$(GNU_HOST_NAME)),)
|
||||
HOST_EXEEXT:=.exe
|
||||
HOST_LIBEXT:=.lib
|
||||
HOST_SHREXT:=.dll
|
||||
|
@ -187,7 +187,6 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
|
||||
-e 's/i[3-9]86/i386/' \
|
||||
-e 's/xtensa.*/xtensa/' \
|
||||
)
|
||||
GNU_HOST_NAME:=$(HOST_ARCH)-$(call qstrip,$(BR2_GNU_BUILD_SUFFIX))
|
||||
|
||||
TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
|
||||
AR="$(TARGET_AR)" \
|
||||
|
@ -372,7 +372,7 @@ BR2_PACKAGE_QT_EMB_PLATFORM:=$(call qstrip,$(BR2_PACKAGE_QT_EMB_PLATFORM))
|
||||
# x86x86fix
|
||||
# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
|
||||
# host. It's unclear if this would happen on other hosts.
|
||||
ifneq ($(findstring pc-linux,$(BR2_GNU_BUILD_SUFFIX)),)
|
||||
ifneq ($(findstring unknown-linux,$(GNU_HOST_NAME)),)
|
||||
ifneq ($(findstring x86,$(BR2_PACKAGE_QT_EMB_PLATFORM)),)
|
||||
QT_CONFIGURE+= -platform linux-g++
|
||||
endif
|
||||
|
Loading…
Reference in New Issue
Block a user