about summary refs log tree commit diff
path: root/localedata
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-10-24 00:08:46 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-10-24 00:08:46 +0000
commit03ac099f6bc9157cdec50db10944e1d99ff07aa1 (patch)
tree9d818c011b71b40675d7de9779f1a4751fc5541c /localedata
parentebfd1bbd04fcc82c34d6f46d942ab763a60ede03 (diff)
downloadglibc-03ac099f6bc9157cdec50db10944e1d99ff07aa1.tar.gz
glibc-03ac099f6bc9157cdec50db10944e1d99ff07aa1.tar.xz
glibc-03ac099f6bc9157cdec50db10944e1d99ff07aa1.zip
Define and use $(run-built-tests).
Diffstat (limited to 'localedata')
-rw-r--r--localedata/ChangeLog5
-rw-r--r--localedata/Makefile4
2 files changed, 7 insertions, 2 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 7ae362c157..3e775ed446 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-23  Joseph Myers  <joseph@codesourcery.com>
+
+	* Makefile [$(cross-compiling) = no]: Change condition to
+	[$(run-built-tests) = yes].
+
 2012-10-22  Jim Blandy  <jimb@codesourcery.com>
 	    Joseph Myers  <joseph@codesourcery.com>
 
diff --git a/localedata/Makefile b/localedata/Makefile
index 5be2413d3c..d1b277ef31 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -59,7 +59,7 @@ generated-dirs := $(ld-test-names) tt_TT de_DE.437			\
 # Get $(inst_i18ndir) defined.
 include ../Makeconfig
 
-ifeq (no,$(cross-compiling))
+ifeq ($(run-built-tests),yes)
 locale_test_suite := tst_iswalnum tst_iswalpha tst_iswcntrl            \
 		     tst_iswctype tst_iswdigit tst_iswgraph            \
 		     tst_iswlower tst_iswprint tst_iswpunct            \
@@ -113,7 +113,7 @@ CFLAGS-tst-mbswcs5.c = -Wno-format
 CFLAGS-tst-trans.c = -Wno-format
 
 
-ifeq (no,$(cross-compiling))
+ifeq ($(run-built-tests),yes)
 # We have to generate locales
 LOCALES := de_DE.ISO-8859-1 de_DE.UTF-8 en_US.ANSI_X3.4-1968 \
 	   en_US.ISO-8859-1 ja_JP.EUC-JP da_DK.ISO-8859-1 \