summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/vars.mk6
-rw-r--r--package/binutils/Makefile4
-rw-r--r--package/bitlbee/Makefile2
-rw-r--r--package/eglibc/Makefile2
-rw-r--r--package/gcc/Makefile4
-rw-r--r--package/kmod/Makefile2
-rw-r--r--package/libx264/Makefile2
-rw-r--r--package/openjdk7/Makefile2
-rw-r--r--package/pcc-libs/Makefile4
-rw-r--r--package/pcc/Makefile4
-rw-r--r--toolchain/Makefile4
-rw-r--r--toolchain/binutils/Makefile2
-rw-r--r--toolchain/eglibc/Makefile14
-rw-r--r--toolchain/eglibc/Makefile.inc8
-rw-r--r--toolchain/gcc/Makefile29
-rw-r--r--toolchain/gdb/Makefile4
-rw-r--r--toolchain/glibc/Makefile.inc10
-rw-r--r--toolchain/musl/Makefile16
18 files changed, 53 insertions, 66 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index ef50e59d8..3798757bc 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -49,11 +49,9 @@ TARGET_PATH= ${SCRIPT_DIR}:${STAGING_TARGET_DIR}/scripts:${STAGING_HOST_DIR}/bi
HOST_PATH= ${SCRIPT_DIR}:${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${_PATH}
AUTOTOOL_PATH= ${STAGING_HOST_DIR}/bin:${STAGING_HOST_DIR}/usr/bin:${STAGING_TARGET_DIR}/scripts:${_PATH}
ifeq ($(ADK_TARGET_ABI_X32),y)
-REAL_GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux-$(ADK_TARGET_SUFFIX)
GNU_TARGET_NAME= $(CPU_ARCH)-x32-linux
else
-REAL_GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
-GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux
+GNU_TARGET_NAME= $(CPU_ARCH)-$(ADK_VENDOR)-linux-$(ADK_TARGET_SUFFIX)
endif
ifeq ($(ADK_DISABLE_HONOUR_CFLAGS),)
@@ -67,7 +65,7 @@ TARGET_CROSS:=
TARGET_COMPILER_PREFIX?=
CONFIGURE_TRIPLE:=
else
-TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(REAL_GNU_TARGET_NAME)-
+TARGET_CROSS:= $(STAGING_HOST_DIR)/bin/$(GNU_TARGET_NAME)-
TARGET_COMPILER_PREFIX?=${TARGET_CROSS}
CONFIGURE_TRIPLE:= --build=${GNU_HOST_NAME} --host=${GNU_TARGET_NAME} --target=${GNU_TARGET_NAME}
endif
diff --git a/package/binutils/Makefile b/package/binutils/Makefile
index 19b945f41..b6e6fb616 100644
--- a/package/binutils/Makefile
+++ b/package/binutils/Makefile
@@ -35,8 +35,8 @@ TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
TARGET_CFLAGS+= -fPIC
ifeq ($(ADK_NATIVE),)
CONFIGURE_ARGS+= --disable-werror \
- --host=$(REAL_GNU_TARGET_NAME) \
- --target=$(REAL_GNU_TARGET_NAME)
+ --host=$(GNU_TARGET_NAME) \
+ --target=$(GNU_TARGET_NAME)
else
CONFIGURE_ARGS+= --disable-werror
endif
diff --git a/package/bitlbee/Makefile b/package/bitlbee/Makefile
index e3ca9f404..0852d8e4f 100644
--- a/package/bitlbee/Makefile
+++ b/package/bitlbee/Makefile
@@ -20,7 +20,7 @@ $(eval $(call PKG_template,BITLBEE,bitlbee,${PKG_VERSION}-${PKG_RELEASE},${PKG_D
CONFIG_STYLE:= minimal
TARGET_CFLAGS+= -fPIC
-CONFIGURE_ARGS:= --target=${REAL_GNU_TARGET_NAME} \
+CONFIGURE_ARGS:= --target=${GNU_TARGET_NAME} \
--prefix=/usr \
--bindir=/usr/sbin \
--etcdir=/etc/bitlbee \
diff --git a/package/eglibc/Makefile b/package/eglibc/Makefile
index 5c21cac3a..9070b5b09 100644
--- a/package/eglibc/Makefile
+++ b/package/eglibc/Makefile
@@ -77,7 +77,7 @@ endif
(cd $(WRKBUILD); \
${EGLIBC_ENV} \
$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/libc/configure \
- --host=$(REAL_GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
--prefix=$(IDIR_EGLIBC_DEV)/usr \
--with-headers=$(IDIR_EGLIBC_DEV)/usr/include \
${EGLIBC_CONFOPTS} \
diff --git a/package/gcc/Makefile b/package/gcc/Makefile
index 99984ac20..6d8ee9620 100644
--- a/package/gcc/Makefile
+++ b/package/gcc/Makefile
@@ -55,8 +55,8 @@ endif
CONFIGURE_ENV+= have_sys_sdt_h=no
-CONFIGURE_ARGS+= --host=$(REAL_GNU_TARGET_NAME) \
- --target=$(REAL_GNU_TARGET_NAME) \
+CONFIGURE_ARGS+= --host=$(GNU_TARGET_NAME) \
+ --target=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--disable-__cxa_atexit \
--without-headers \
diff --git a/package/kmod/Makefile b/package/kmod/Makefile
index 944f47599..e02addded 100644
--- a/package/kmod/Makefile
+++ b/package/kmod/Makefile
@@ -20,7 +20,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,KMOD,kmod,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
CONFIG_STYLE:= minimal
-CONFIGURE_ARGS+= --host=${REAL_GNU_TARGET_NAME}
+CONFIGURE_ARGS+= --host=${GNU_TARGET_NAME}
kmod-install:
$(INSTALL_DIR) $(IDIR_KMOD)/usr/bin
diff --git a/package/libx264/Makefile b/package/libx264/Makefile
index 0a82c5f62..96f6de14d 100644
--- a/package/libx264/Makefile
+++ b/package/libx264/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+= --disable-cli \
--disable-opencl \
--enable-shared \
--prefix=/usr \
- --host=${REAL_GNU_TARGET_NAME} \
+ --host=${GNU_TARGET_NAME} \
--sysroot=${STAGING_TARGET_DIR} \
--cross-prefix=$(TARGET_CROSS)
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index 57a9248bb..d9c2f04de 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -88,7 +88,7 @@ CONFIGURE_ARGS+= $(CONFIGURE_COMMON)
CONFIGURE_ARGS+= --disable-bootstrap
CONFIGURE_ENV+= LD_LIBRARY_PATH=$(STAGING_HOST_DIR)/usr/lib
-MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/bin \
+MAKE_ENV+= ALT_COMPILER_PATH=$(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin \
ALT_OPENWIN_HOME=$(STAGING_DIR)/usr/ \
ALT_CUPS_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
ALT_FREETYPE_HEADERS_PATH=$(STAGING_DIR)/usr/include/ \
diff --git a/package/pcc-libs/Makefile b/package/pcc-libs/Makefile
index 9860b6805..16b05879e 100644
--- a/package/pcc-libs/Makefile
+++ b/package/pcc-libs/Makefile
@@ -20,8 +20,8 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,PCC_LIBS,pcc-libs,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
# we cross-compile a native compiler for the target system
-CONFIGURE_ARGS+= --host=${REAL_GNU_TARGET_NAME}
-CONFIGURE_ARGS+= --target=${REAL_GNU_TARGET_NAME}
+CONFIGURE_ARGS+= --host=${GNU_TARGET_NAME}
+CONFIGURE_ARGS+= --target=${GNU_TARGET_NAME}
pcc-libs-install:
$(INSTALL_DIR) $(IDIR_PCC_LIBS)/usr/bin
diff --git a/package/pcc/Makefile b/package/pcc/Makefile
index c7f3878da..8adc848ca 100644
--- a/package/pcc/Makefile
+++ b/package/pcc/Makefile
@@ -22,8 +22,8 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,PCC,pcc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
# we cross-compile a native compiler for the target system
-CONFIGURE_ARGS+= --host=${REAL_GNU_TARGET_NAME}
-CONFIGURE_ARGS+= --target=${REAL_GNU_TARGET_NAME}
+CONFIGURE_ARGS+= --host=${GNU_TARGET_NAME}
+CONFIGURE_ARGS+= --target=${GNU_TARGET_NAME}
CONFIGURE_ARGS+= --with-assembler=/usr/bin/as
CONFIGURE_ARGS+= --with-linker=/usr/bin/ld
diff --git a/toolchain/Makefile b/toolchain/Makefile
index b61133b28..460cbf97f 100644
--- a/toolchain/Makefile
+++ b/toolchain/Makefile
@@ -60,8 +60,8 @@ endif
$(STAGING_HOST_DIR):
@mkdir -p $(STAGING_HOST_DIR)/lib
@mkdir -p $(STAGING_HOST_DIR)/include
- @mkdir -p $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)
- @ln -sf ../lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib
+ @mkdir -p $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)
+ @ln -sf ../lib $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/lib
%-download:
$(TRACE) toolchain/$(patsubst %-download,%,$@)/download
diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile
index 201f8538c..8ebbea53c 100644
--- a/toolchain/binutils/Makefile
+++ b/toolchain/binutils/Makefile
@@ -29,7 +29,7 @@ $(WRKBUILD)/.configured:
(cd $(WRKBUILD); \
$(WRKBUILD)/configure \
--prefix=$(STAGING_HOST_DIR) \
- --target=$(REAL_GNU_TARGET_NAME) \
+ --target=$(GNU_TARGET_NAME) \
--with-sysroot=$(STAGING_TARGET_DIR) \
--disable-multilib \
--disable-dependency-tracking \
diff --git a/toolchain/eglibc/Makefile b/toolchain/eglibc/Makefile
index e2028dcd4..20b6f33ac 100644
--- a/toolchain/eglibc/Makefile
+++ b/toolchain/eglibc/Makefile
@@ -30,11 +30,11 @@ $(WRKBUILD)/.headers_configure:
$(WRKBUILD)/libc/option-groups.config
(cd $(EGLIBC_BUILD_DIR_INITIAL); \
${EGLIBC_ENV} \
- CC="${REAL_GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
+ CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
$(WRKBUILD)/libc/configure \
--prefix=$(STAGING_TARGET_DIR)/usr \
--with-headers=$(STAGING_TARGET_DIR)/usr/include \
- --host=$(REAL_GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
${EGLIBC_CONFOPTS} \
);
touch $@
@@ -42,7 +42,7 @@ $(WRKBUILD)/.headers_configure:
$(WRKBUILD)/.headers: $(WRKBUILD)/.headers_configure
(cd $(EGLIBC_BUILD_DIR_INITIAL); \
${EGLIBC_ENV} \
- CC="${REAL_GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
+ CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
$(MAKE) install-headers install-bootstrap-headers=yes cross-compiling=yes \
);
touch $(STAGING_TARGET_DIR)/usr/include/gnu/stubs.h
@@ -61,12 +61,12 @@ $(WRKBUILD)/.configured:
$(EGLIBC_BUILD_DIR_FINAL)/option-groups.config
(cd $(EGLIBC_BUILD_DIR_FINAL); \
${EGLIBC_ENV} \
- CC="${REAL_GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
+ CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
$(WRKBUILD)/libc/configure \
--prefix=/usr \
--enable-shared \
--enable-stackguard-randomization \
- --host=$(REAL_GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
${EGLIBC_CONFOPTS} \
);
touch $@
@@ -74,13 +74,13 @@ $(WRKBUILD)/.configured:
$(EGLIBC_BUILD_DIR_FINAL)/libc.so:
$(WRKBUILD)/.compiled: $(WRKBUILD)/.configured
${EGLIBC_ENV} \
- CC="${REAL_GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
+ CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
$(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) cross-compiling=yes all
touch $@
$(WRKBUILD)/.installed: $(EGLIBC_BUILD_DIR_FINAL)/libc.so
${EGLIBC_ENV} \
- CC="${REAL_GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
+ CC="${GNU_TARGET_NAME}-gcc $(ADK_TARGET_ABI_CFLAGS)" \
$(MAKE) -C $(EGLIBC_BUILD_DIR_FINAL) install_root=$(STAGING_TARGET_DIR) install
${INSTALL_DIR} ${STAGING_TARGET_DIR}/etc
${INSTALL_DATA} ${WRKBUILD}/libc/posix/gai.conf ${STAGING_TARGET_DIR}/etc/
diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc
index 1ac72ef54..7213a45c3 100644
--- a/toolchain/eglibc/Makefile.inc
+++ b/toolchain/eglibc/Makefile.inc
@@ -22,10 +22,10 @@ EGLIBC_ENV:= PATH='${TARGET_PATH}' \
BUILD_CC=${CC_FOR_BUILD} \
GCC_HONOUR_COPTS=s \
CFLAGS="$(TARGET_CFLAGS_LIBC)" \
- CC=${REAL_GNU_TARGET_NAME}-gcc \
- CXX=${REAL_GNU_TARGET_NAME}-g++ \
- AR=${REAL_GNU_TARGET_NAME}-ar \
- RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \
+ CC=${GNU_TARGET_NAME}-gcc \
+ CXX=${GNU_TARGET_NAME}-g++ \
+ AR=${GNU_TARGET_NAME}-ar \
+ RANLIB=${GNU_TARGET_NAME}-ranlib \
libc_cv_cc_with_libunwind=no \
libc_cv_forced_unwind=yes \
libc_cv_c_cleanup=yes \
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index 4b0212f77..d29778c2e 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -12,7 +12,7 @@ GCC_CONFOPTS= --prefix=$(STAGING_HOST_DIR) \
--with-bugurl="http://www.openadk.org/" \
--build=$(GNU_HOST_NAME) \
--host=$(GNU_HOST_NAME) \
- --target=$(REAL_GNU_TARGET_NAME) \
+ --target=$(GNU_TARGET_NAME) \
--with-gmp=$(STAGING_HOST_DIR) \
--with-mpfr=$(STAGING_HOST_DIR) \
--with-libelf=$(STAGING_HOST_DIR) \
@@ -122,10 +122,10 @@ GCC_BUILD_DIR_FINAL:= $(WRKBUILD)-final
$(GCC_BUILD_DIR_MINIMAL)/.configured:
mkdir -p $(GCC_BUILD_DIR_MINIMAL)
# these symlinks are very important, do not remove
- rm -rf $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
- ln -sf ${STAGING_TARGET_DIR}/usr/include $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
- rm -rf ${STAGING_HOST_DIR}/$(REAL_GNU_TARGET_NAME)/lib
- ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib
+ rm -rf $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/sys-include
+ ln -sf ${STAGING_TARGET_DIR}/usr/include $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/sys-include
+ rm -rf ${STAGING_HOST_DIR}/$(GNU_TARGET_NAME)/lib
+ ln -sf ${STAGING_TARGET_DIR}/lib $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/lib
ifeq ($(ADK_LINUX_SH),y)
(cd ${STAGING_TARGET_DIR}/ && ln -sf . m4 && ln -sf . m4-nofpu)
endif
@@ -182,29 +182,20 @@ $(WRKBUILD)/.compiled: $(GCC_BUILD_DIR_FINAL)/.configured
$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
PATH='$(TARGET_PATH)' $(MAKE) -C $(GCC_BUILD_DIR_FINAL) install
- # Set up the symlinks to enable lying about target name
- set -e; \
- cd $(STAGING_HOST_DIR); \
- ln -sf $(REAL_GNU_TARGET_NAME) $(GNU_TARGET_NAME); \
- cd bin; \
- for app in $(REAL_GNU_TARGET_NAME)-* ; do \
- ln -sf $${app} \
- $(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
- done;
# remove duplicate tools, convert hardlinks to symlinks
set -e; \
cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/bin; \
for app in ar as c++ g++ gcc ld ld.bfd nm objcopy objdump ranlib strip; do \
- ln -sf ../../bin/$(REAL_GNU_TARGET_NAME)-$${app} $${app}; \
+ ln -sf ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \
done;
(cd $(STAGING_HOST_DIR)/bin && \
- ln -sf $(REAL_GNU_TARGET_NAME)-gcc $(REAL_GNU_TARGET_NAME)-gcc-${PKG_VERSION})
+ ln -sf $(GNU_TARGET_NAME)-gcc $(GNU_TARGET_NAME)-gcc-${PKG_VERSION})
# setup symlink, so that gcc/g++ find cc1plus
- (cd $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/ && \
+ (cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/ && \
ln -sf ../libexec .)
# setup symlink, so that gcc/g++ find stddef.h
- (cd $(STAGING_HOST_DIR)/$(REAL_GNU_TARGET_NAME)/lib/ && \
- ln -sf ../../host_${CPU_ARCH}_${ADK_TARGET_SUFFIX}_${ADK_TARGET_LIBC}/lib/gcc .)
+ (cd $(STAGING_HOST_DIR)/$(GNU_TARGET_NAME)/lib/ && \
+ ln -sf ../../host_${CPU_ARCH}_${ADK_TARGET_LIBC}_${ADK_TARGET_SUFFIX}/lib/gcc .)
# fix linking g++ apps with libtool
@-test -d $(STAGING_TARGET_DIR)/lib32 && \
cd $(STAGING_TARGET_DIR)/lib32 && \
diff --git a/toolchain/gdb/Makefile b/toolchain/gdb/Makefile
index c56ed99f9..a66e3fe7d 100644
--- a/toolchain/gdb/Makefile
+++ b/toolchain/gdb/Makefile
@@ -18,7 +18,7 @@ $(WRKBUILD)/.configured:
--prefix=$(STAGING_HOST_DIR) \
--build=$(GNU_HOST_NAME) \
--host=$(GNU_HOST_NAME) \
- --target=$(REAL_GNU_TARGET_NAME) \
+ --target=$(GNU_TARGET_NAME) \
--disable-dependency-tracking \
--without-uiout \
--enable-gdbmi \
@@ -41,8 +41,6 @@ $(WRKBUILD)/.compiled:
$(WRKBUILD)/.installed:
install -c $(WRKBUILD)/gdb/gdb $(TARGET_CROSS)gdb
- cd $(STAGING_HOST_DIR)/bin && \
- ln -fs $(TARGET_CROSS)gdb $(GNU_TARGET_NAME)-gdb
touch $@
include ${TOPDIR}/mk/toolchain.mk
diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index e28405643..3c1a3167d 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -7,7 +7,7 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 5374d29864b583622b62bfc6b8429418
PKG_SITES:= ${MASTER_SITE_GNU:=glibc/}
GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \
- --host=$(REAL_GNU_TARGET_NAME) \
+ --host=$(GNU_TARGET_NAME) \
--with-headers=$(STAGING_TARGET_DIR)/usr/include \
--disable-sanity-checks \
--disable-nls \
@@ -23,10 +23,10 @@ GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \
GLIBC_ENV:= PATH='${TARGET_PATH}' \
BUILD_CC=${CC_FOR_BUILD} \
CFLAGS="$(TARGET_CFLAGS_LIBC)" \
- CC=${REAL_GNU_TARGET_NAME}-gcc \
- CXX=${REAL_GNU_TARGET_NAME}-g++ \
- AR=${REAL_GNU_TARGET_NAME}-ar \
- RANLIB=${REAL_GNU_TARGET_NAME}-ranlib \
+ CC=${GNU_TARGET_NAME}-gcc \
+ CXX=${GNU_TARGET_NAME}-g++ \
+ AR=${GNU_TARGET_NAME}-ar \
+ RANLIB=${GNU_TARGET_NAME}-ranlib \
libc_cv_forced_unwind=yes \
libc_cv_cc_with_libunwind=yes \
libc_cv_c_cleanup=yes \
diff --git a/toolchain/musl/Makefile b/toolchain/musl/Makefile
index b94c4e916..abb7af366 100644
--- a/toolchain/musl/Makefile
+++ b/toolchain/musl/Makefile
@@ -7,25 +7,25 @@ include Makefile.inc
include ${TOPDIR}/mk/buildhlp.mk
ifeq ($(CPU_ARCH),ppc)
-REAL_GNU_TARGET_NAME:= $(subst ppc,powerpc,$(REAL_GNU_TARGET_NAME))
+GNU_TARGET_NAME:= $(subst ppc,powerpc,$(GNU_TARGET_NAME))
endif
ifeq ($(CPU_ARCH),mips64el)
-REAL_GNU_TARGET_NAME:= $(subst mips64el,mips,$(REAL_GNU_TARGET_NAME))
+GNU_TARGET_NAME:= $(subst mips64el,mips,$(GNU_TARGET_NAME))
endif
ifeq ($(CPU_ARCH),mips64)
-REAL_GNU_TARGET_NAME:= $(subst mips64,mips,$(REAL_GNU_TARGET_NAME))
+GNU_TARGET_NAME:= $(subst mips64,mips,$(GNU_TARGET_NAME))
endif
ifeq ($(CPU_ARCH),microblazeel)
-REAL_GNU_TARGET_NAME:= $(subst microblazeel,microblaze,$(REAL_GNU_TARGET_NAME))
+GNU_TARGET_NAME:= $(subst microblazeel,microblaze,$(GNU_TARGET_NAME))
endif
ifeq ($(CPU_ARCH),sh4)
-REAL_GNU_TARGET_NAME:= $(subst sh4,sh,$(REAL_GNU_TARGET_NAME))
+GNU_TARGET_NAME:= $(subst sh4,sh,$(GNU_TARGET_NAME))
endif
$(WRKBUILD)/.headers:
(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
./configure --prefix=/usr \
- --target=$(REAL_GNU_TARGET_NAME) \
+ --target=$(GNU_TARGET_NAME) \
--disable-gcc-wrapper \
)
$(MAKE) -C $(WRKBUILD) DESTDIR=$(STAGING_TARGET_DIR) install-headers
@@ -37,7 +37,7 @@ $(WRKBUILD)/.compiled:
$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean
(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
./configure --prefix=/usr \
- --target=$(REAL_GNU_TARGET_NAME) \
+ --target=$(GNU_TARGET_NAME) \
--disable-gcc-wrapper \
)
$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all
@@ -52,7 +52,7 @@ $(WRKBUILD)/.fixup:
$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) clean
(cd $(WRKBUILD); CC='$(TARGET_CC)' CROSS_COMPILE='$(TARGET_CROSS)' \
./configure --prefix=/usr \
- --target=$(REAL_GNU_TARGET_NAME) \
+ --target=$(GNU_TARGET_NAME) \
--disable-gcc-wrapper \
)
$(MAKE) CFLAGS='$(TARGET_CFLAGS)' -C $(WRKBUILD) all
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 12:57:40 +0000