diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-10-02 14:31:48 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2016-10-02 17:07:59 +0200 |
| commit | 1ecabcafa838ea0ec2d5d7db24cbdfba2f123af2 (patch) | |
| tree | 2a88f9c5bec4f11f9b09c4ea803fe2eb99a8d54e /toolchain/uclibc-ng | |
| parent | f933c40ae7f7124abf29f279058ef1fc7ad3f14c (diff) | |
uclibc-ng: rework package, fix spurious unneeded rebuilds
Diffstat (limited to 'toolchain/uclibc-ng')
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 192b34daa..0561243ac 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -41,9 +41,9 @@ UCLIBC_MAKEOPTS+= -j${ADK_MAKE_JOBS} endif $(WRKBUILD)/.configured: $(WRKBUILD)/.prepared - $(SED) 's,^CROSS_COMPILE=.*,CROSS_COMPILE=$(TARGET_CROSS),g' $(WRKBUILD)/Rules.mak PATH='$(HOST_PATH)' sed -e 's^KERNEL_HEADERS.*$$KERNEL_HEADERS=\"${STAGING_TARGET_DIR}/usr/include\"' \ $(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/uclibc-ng.config >${WRKBUILD}/.config + $(SED) 's^.*\(CROSS_COMPILER_PREFIX\).*^\1=\"$(TARGET_CROSS)\"^' ${WRKBUILD}/.config ifeq ($(ADK_TARGET_ENDIAN),little) $(SED) 's/.*\(ARCH_LITTLE_ENDIAN\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(ARCH_WANTS_LITTLE_ENDIAN\).*/\1=y/' ${WRKBUILD}/.config @@ -284,7 +284,7 @@ ifeq ($(ADK_TARGET_ABI_O32),y) $(SED) 's/.*\(CONFIG_MIPS_N64_ABI\).*/# \1 is not set/' ${WRKBUILD}/.config endif endif - echo N|PATH='$(HOST_PATH)' $(MAKE) $(UCLIBC_MAKEOPTS) -C $(WRKBUILD) \ + echo N|PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ HOSTCC="$(HOST_CC)" \ CC='$(TARGET_CC)' \ PREFIX=$(STAGING_TARGET_DIR) \ @@ -300,30 +300,54 @@ endif $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured PATH='$(HOST_PATH)' $(MAKE) $(UCLIBC_MAKEOPTS) -C $(WRKBUILD) \ + ARCH="$(ADK_TARGET_ARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ HOSTCC="$(HOST_CC)" \ - CC='$(TARGET_CC)' \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ - DEVEL_PREFIX_LIB=/ \ RUNTIME_PREFIX=/ \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ VERBOSE=1 \ - all utils + all touch $@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ + ARCH="$(ADK_TARGET_ARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ HOSTCC="$(HOST_CC)" \ - CC='$(TARGET_CC)' \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ - DEVEL_PREFIX_LIB=/ \ RUNTIME_PREFIX=/ \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ VERBOSE=1 \ - install_runtime install_dev install_utils + install_runtime install_dev + PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ + ARCH="$(ADK_TARGET_ARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + HOSTCC="$(HOST_CC)" \ + PREFIX=$(STAGING_TARGET_DIR)/uclibc-ng \ + DEVEL_PREFIX=/usr/ \ + RUNTIME_PREFIX=/ \ + UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ + UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ + VERBOSE=1 \ + install_runtime + PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ + ARCH="$(ADK_TARGET_ARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + HOSTCC="$(HOST_CC)" \ + PREFIX=$(STAGING_TARGET_DIR)/uclibc-ng \ + DEVEL_PREFIX=/usr/ \ + RUNTIME_PREFIX=/ \ + UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ + UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ + TEST_INSTALLED_UCLIBC=1 \ + UCLIBC_ONLY=1 \ + VERBOSE=1 \ + test_compile test_gen touch $@ include ${ADK_TOPDIR}/mk/toolchain.mk |