summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2006-11-23 12:24:48 +0000
committerMarc Kleine-Budde <mkl@pengutronix.de>2006-11-23 12:24:48 +0000
commit0a50fa8de48c33215d6829e7d2008b8e9eb389fb (patch)
tree30c741739f590096f83150f5ee439a38fef77429
parente6d9db832c2072657f1d44d47c0b0c7e3bd21b64 (diff)
downloadOSELAS.Toolchain-0a50fa8de48c33215d6829e7d2008b8e9eb389fb.tar.gz
OSELAS.Toolchain-0a50fa8de48c33215d6829e7d2008b8e9eb389fb.tar.xz
* rules/glibc-crt.make, rules/glibc.in, rules/glibc.make:
added support for GLIBC_EXTRA_ENV git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@1323 f8d472c7-5700-0410-ac5a-87979cec3adf
-rw-r--r--rules/glibc-crt.make4
-rw-r--r--rules/glibc.in12
-rw-r--r--rules/glibc.make5
3 files changed, 11 insertions, 10 deletions
diff --git a/rules/glibc-crt.make b/rules/glibc-crt.make
index dda44bd..c56d82b 100644
--- a/rules/glibc-crt.make
+++ b/rules/glibc-crt.make
@@ -58,7 +58,7 @@ GLIBC_CRT_AUTOCONF = $(GLIBC_AUTOCONF)
$(STATEDIR)/glibc-crt.prepare: $(glibc-crt_prepare_deps_default)
@$(call targetinfo, $@)
@$(call clean, $(GLIBC_CRT_DIR)/config.cache)
- cd $(GLIBC_CRT_DIR) && \
+ cd $(GLIBC_CRT_DIR) && eval \
$(GLIBC_CRT_PATH) $(GLIBC_CRT_ENV) \
$(GLIBC_DIR)/configure $(GLIBC_CRT_AUTOCONF)
@$(call touch, $@)
@@ -71,7 +71,7 @@ glibc-crt_compile: $(STATEDIR)/glibc-crt.compile
$(STATEDIR)/glibc-crt.compile: $(glibc-crt_compile_deps_default)
@$(call targetinfo, $@)
- cd $(GLIBC_CRT_DIR) && $(GLIBC_CRT_ENV) $(GLIBC_CRT_PATH) \
+ cd $(GLIBC_CRT_DIR) && $(GLIBC_CRT_PATH) \
$(MAKE) $(PARALLELMFLAGS) csu/subdir_lib
@$(call touch, $@)
diff --git a/rules/glibc.in b/rules/glibc.in
index 08011d6..708d867 100644
--- a/rules/glibc.in
+++ b/rules/glibc.in
@@ -34,12 +34,12 @@ config GLIBC_SERIES
string
prompt "glibc patch series file"
-#config GLIBC_EXTRA_ENV
-# depends on GLIBC
-# string
-# prompt "extra environment"
-# help
-# Add this to the glibc environment.
+config GLIBC_EXTRA_ENV
+ depends on GLIBC
+ string
+ prompt "extra environment"
+ help
+ Add this to the glibc environment.
#config GLIBC_ADDON_CRYPT
# depends on GLIBC
diff --git a/rules/glibc.make b/rules/glibc.make
index 3c74a73..be67448 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -72,7 +72,8 @@ GLIBC_PATH := PATH=$(CROSS_PATH)
GLIBC_ENV := \
BUILD_CC=$(HOSTCC) \
libc_cv_forced_unwind=yes \
- libc_cv_c_cleanup=yes
+ libc_cv_c_cleanup=yes \
+ $(PTXCONF_GLIBC_EXTRA_ENV)
#
# libc_cv_forced_unwind=yes
@@ -124,7 +125,7 @@ endif
$(STATEDIR)/glibc.prepare: $(glibc_prepare_deps_default)
@$(call targetinfo, $@)
- cd $(GLIBC_BUILDDIR) && \
+ cd $(GLIBC_BUILDDIR) && eval \
$(GLIBC_ENV) $(GLIBC_PATH) \
$(GLIBC_DIR)/configure $(GLIBC_AUTOCONF)
@$(call touch, $@)