[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[patches] [PATCH] fix call to cross-zic in testsuite



Hi,

When running the testsuite on a "biarch build" (e.g. i386 build on
x86_64), cross-zic is called with the target ld.so, which indeed
doesn't work. The patch below changes that to call cross-zic 
directly.

Regards,
Aurelien

2009-03-01  Aurelien Jarno  <aurelien@xxxxxxxxxxx>

	* timezone/Makefile: Call cross-zic directly instead of using
	the target ld.so while generating testdata.

Index: timezone/Makefile
===================================================================
--- timezone/Makefile	(revision 8009)
+++ timezone/Makefile	(working copy)
@@ -202,10 +202,17 @@
 # Don't add leapseconds here since test-tz made checks that work only without
 # leapseconds.
 testdata = $(objpfx)testdata
+ifeq (no,$(cross-compiling))
 define build-testdata
 GCONV_PATH=${common-objpfx}iconvdata LANGUAGE=C LC_ALL=C \
   $(built-program-cmd) -d $(testdata) -y ./yearistype $<
 endef
+else
+define build-testdata
+LANGUAGE=C LC_ALL=C \
+  $(objpfx)cross-zic -d $(testdata) -y ./yearistype $<
+endef
+endif
 
 $(objpfx)test-tz.out: $(addprefix $(testdata)/, America/New_York Etc/UTC UTC)
 $(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@xxxxxxxxxxx                 http://www.aurel32.net