diff options
-rw-r--r-- | package/uclibc-ng/Makefile | 2 | ||||
-rw-r--r-- | toolchain/uclibc-ng/Makefile | 24 |
2 files changed, 14 insertions, 12 deletions
diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index a2164af37..7e948e196 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -77,8 +77,6 @@ uclibc-ng-test-install: ${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/test \ ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng - ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/{Rules.mak,.config} \ - ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng @find ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng -name \*.o -exec rm {} \; include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 91722f968..d129588a6 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -285,17 +285,17 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured PATH='$(HOST_PATH)' $(MAKE) $(UCLIBC_MAKEOPTS) -C $(WRKBUILD) \ HOSTCC="$(HOST_CC)" \ CC='$(TARGET_CC)' \ - PREFIX= \ + PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ + DEVEL_PREFIX_LIB=/ \ RUNTIME_PREFIX=/ \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ + TEST_INSTALLED_UCLIBC=1 \ + UCLIBC_ONLY=1 \ VERBOSE=1 \ all - touch $@ - -$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled - PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ + PATH='$(HOST_PATH)' $(MAKE) $(UCLIBC_MAKEOPTS) -C $(WRKBUILD) \ HOSTCC="$(HOST_CC)" \ CC='$(TARGET_CC)' \ PREFIX=$(STAGING_TARGET_DIR) \ @@ -304,20 +304,24 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled RUNTIME_PREFIX=/ \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ + TEST_INSTALLED_UCLIBC=1 \ + UCLIBC_ONLY=1 \ VERBOSE=1 \ - install_runtime install_dev + test_compile test_gen + touch $@ + +$(WRKBUILD)/.installed: $(WRKBUILD)/.compiled PATH='$(HOST_PATH)' $(MAKE) -C $(WRKBUILD) \ HOSTCC="$(HOST_CC)" \ CC='$(TARGET_CC)' \ - PREFIX= \ + PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ + DEVEL_PREFIX_LIB=/ \ 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 + install_runtime install_dev touch $@ include ${ADK_TOPDIR}/mk/toolchain.mk |