diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-14 05:23:05 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2015-12-14 05:23:05 +0100 |
| commit | ece758372ca0fe88b50bfabea2d7ea78a88aab4b (patch) | |
| tree | 682125abdfd63a8d6e65653b5faf6e30f0db6cb1 | |
| parent | f83e9bba36235d63f4ec56b281a5efa1480bf142 (diff) | |
be sure to create staging target /usr/lib, remove duplicate HOSTCC
| -rw-r--r-- | mk/build.mk | 4 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index d7e32110c..d8fbe1839 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -21,7 +21,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_RUNTIME_START_SERVICES=n \ ADK_PACKAGE_BASE_FILES=y \ ADK_PACKAGE_KEXECINIT=n \ - ADK_PACKAGE_SAMBA3=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_OPENSSL=n \ ADK_PACKAGE_LIBOPENSSL=n \ @@ -179,10 +178,11 @@ ifeq ($(ADK_TARGET_PACKAGE_OPKG),y) endif ${STAGING_TARGET_DIR} ${STAGING_TARGET_DIR}/etc ${STAGING_HOST_DIR}: + mkdir -p ${STAGING_TARGET_DIR}/lib mkdir -p ${STAGING_TARGET_DIR}/bin mkdir -p ${STAGING_TARGET_DIR}/etc mkdir -p ${STAGING_TARGET_DIR}/usr/bin - mkdir -p ${STAGING_TARGET_DIR}/lib + mkdir -p ${STAGING_TARGET_DIR}/usr/lib/pkgconfig mkdir -p ${STAGING_HOST_DIR}/usr/bin mkdir -p ${STAGING_HOST_DIR}/usr/lib mkdir -p ${STAGING_HOST_DIR}/usr/include diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 526009a24..8fb71208e 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -279,10 +279,10 @@ ifeq ($(ADK_TARGET_ABI_O32),y) endif endif echo N|PATH='$(HOST_PATH)' $(MAKE) $(UCLIBC_MAKEOPTS) -C $(WRKBUILD) \ + HOSTCC="$(HOST_CC)" \ PREFIX=$(STAGING_TARGET_DIR) \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(STAGING_TARGET_DIR) \ - HOSTCC="$(HOST_CC)" \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ oldconfig @@ -295,7 +295,6 @@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured PREFIX= \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ - HOSTCC="$(HOST_CC)" \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ VERBOSE=1 \ @@ -320,7 +319,6 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled PREFIX= \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=/ \ - HOSTCC="$(HOST_CC)" \ UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ TEST_INSTALLED_UCLIBC=1 \ |