summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2013-12-22 13:45:28 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2014-02-02 15:59:24 +0100
commitc43d08d9e58c354538214ff7226a24f919fcae6a (patch)
tree2be08bba8aaf153dabfd247386dd8906ac19861b
parentee944ce2788ca574fd49635915588ae4d84414ae (diff)
downloadOSELAS.Toolchain-c43d08d9e58c354538214ff7226a24f919fcae6a.tar.gz
OSELAS.Toolchain-c43d08d9e58c354538214ff7226a24f919fcae6a.tar.xz
uclibc: cleanup
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/uclibc-headers.make4
-rw-r--r--rules/uclibc.make30
2 files changed, 9 insertions, 25 deletions
diff --git a/rules/uclibc-headers.make b/rules/uclibc-headers.make
index 460e9bb..25f019b 100644
--- a/rules/uclibc-headers.make
+++ b/rules/uclibc-headers.make
@@ -39,7 +39,7 @@ $(STATEDIR)/uclibc-headers.prepare: $(STATEDIR)/uclibc.extract $(UCLIBC_CONFIG)
cd $(UCLIBC_DIR) && yes "" | \
$(UCLIBC_PATH) $(UCLIBC_ENV) $(MAKE) \
- $(UCLIBC_MAKEVARS) oldconfig
+ $(UCLIBC_MAKE_OPT) oldconfig
@$(call touch)
@@ -59,7 +59,7 @@ $(STATEDIR)/uclibc-headers.install:
@$(call targetinfo)
cd $(UCLIBC_DIR) && \
$(UCLIBC_PATH) $(UCLIBC_ENV) \
- $(MAKE) $(UCLIBC_MAKEVARS) \
+ $(MAKE) $(UCLIBC_MAKE_OPT) \
install_headers
@$(call touch)
diff --git a/rules/uclibc.make b/rules/uclibc.make
index b9b3409..2a03bfe 100644
--- a/rules/uclibc.make
+++ b/rules/uclibc.make
@@ -32,7 +32,7 @@ UCLIBC_CONFIG := $(call remove_quotes, $(PTXDIST_PLATFORMCONFIGDIR)/config/$(PTX
UCLIBC_PATH := PATH=$(CROSS_PATH)
UCLIBC_ENV := KCONFIG_NOTIMESTAMP=1 $(HOST_ENV_CC)
-UCLIBC_MAKEVARS := \
+UCLIBC_MAKE_OPT := \
CROSS=$(COMPILER_PREFIX) \
HOSTCC="$(HOSTCC)" \
DEVEL_PREFIX=/usr/ \
@@ -41,29 +41,13 @@ UCLIBC_MAKEVARS := \
RUNTIME_PREFIX=/ \
SHARED_LIB_LOADER_PREFIX=/lib
-$(STATEDIR)/uclibc.prepare: $(STATEDIR)/uclibc-headers.install
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/uclibc.compile:
- @$(call targetinfo)
- cd $(UCLIBC_DIR) && $(UCLIBC_PATH) $(MAKE) $(UCLIBC_MAKEVARS)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
+UCLIBC_INSTALL_OPT := \
+ $(UCLIBC_MAKE_OPT) \
+ DEVEL_PREFIX=/usr/ \
+ PREFIX=$(SYSROOT) \
+ install
-$(STATEDIR)/uclibc.install:
- @$(call targetinfo)
- cd $(UCLIBC_DIR) && \
- $(UCLIBC_PATH) $(MAKE) $(UCLIBC_MAKEVARS) \
- install DEVEL_PREFIX=/usr/ PREFIX=$(SYSROOT)
- @$(call touch)
+$(STATEDIR)/uclibc.prepare: $(STATEDIR)/uclibc-headers.install
# ----------------------------------------------------------------------------
# oldconfig / menuconfig