deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

uclibc: two-stage gcc simplifications

Browse source 
After switching to a two stage gcc solution, there is no longer a need
to do weird things in the uclibc build. We can greatly simplify
UCLIBC_CONFIGURE_CMDS to only do the configuration, and let the
existing UCLIBC_BUILD_CMDS do the build. Note that we have to build
the headers before starting the C library build, otherwise there is a
build failure (probably a uClibc bug).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Thomas Petazzoni 2014-09-14 11:50:03 +02:00 committed by Peter Korsgaard
parent 08d34dfa15
commit 841185df93
1 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
package/uclibc/uclibc.mk
View file

@ -433,20 +433,6 @@ define UCLIBC_KCONFIG_FIXUP_CMDS
$(UCLIBC_STRIP_CONFIG)
endef
define UCLIBC_CONFIGURE_CMDS
$(MAKE1) -C $(UCLIBC_DIR) \
$(UCLIBC_MAKE_FLAGS) \
PREFIX=$(STAGING_DIR) \
DEVEL_PREFIX=/usr/ \
RUNTIME_PREFIX=$(STAGING_DIR) \
headers startfiles \
install_headers install_startfiles
$(TARGET_CROSS)gcc -nostdlib \
-nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libc.so
$(TARGET_CROSS)gcc -nostdlib \
-nostartfiles -shared -x c /dev/null -o $(STAGING_DIR)/usr/lib/libm.so
endef
ifeq ($(BR2_UCLIBC_INSTALL_TEST_SUITE),y)
define UCLIBC_BUILD_TEST_SUITE
$(MAKE1) -C $(@D)/test \
@ -471,12 +457,8 @@ else
endif
define UCLIBC_BUILD_CMDS
$(UCLIBC_MAKE) -C $(@D) \
$(UCLIBC_MAKE_FLAGS) \
PREFIX= \
DEVEL_PREFIX=/ \
RUNTIME_PREFIX=/ \
all
$(UCLIBC_MAKE) -C $(@D) $(UCLIBC_MAKE_FLAGS) headers
$(UCLIBC_MAKE) -C $(@D) $(UCLIBC_MAKE_FLAGS)
$(MAKE) -C $(@D)/utils \
PREFIX=$(HOST_DIR) \
HOSTCC="$(HOSTCC)" hostutils