diff options
Diffstat (limited to 'libc/timezone')
| -rw-r--r-- | libc/timezone/Makefile | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/libc/timezone/Makefile b/libc/timezone/Makefile index e7370d3d9..5272c5508 100644 --- a/libc/timezone/Makefile +++ b/libc/timezone/Makefile @@ -52,16 +52,7 @@ endif include ../Rules -zic-objs = zic.o ialloc.o scheck.o - -$(objpfx)zic: $(addprefix $(objpfx), $(zic-objs)) - -$(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c - $(BUILD_CC) $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \ - -DCROSS_ZIC $(compile-mkdep-flags) - -$(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs)) - $(BUILD_CC) $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@ +$(objpfx)zic: $(objpfx)scheck.o $(objpfx)ialloc.o tz-cflags = -DTZDIR='"$(zonedir)"' \ -DTZDEFAULT='"$(localtime-file)"' \ @@ -78,17 +69,10 @@ CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID -DHAVE_GETTEXT # 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)/, \ @@ -101,11 +85,7 @@ test-tz-ENV = TZDIR=$(testdata) tst-timezone-ENV = TZDIR=$(testdata) # Note this must come second in the deps list for $(built-program-cmd) to work. -ifeq (no,$(cross-compiling)) zic-deps = $(objpfx)zic $(leapseconds) yearistype -else -zic-deps = $(objpfx)cross-zic $(objpfx)zic $(leapseconds) yearistype -endif $(testdata)/America/New_York: northamerica $(zic-deps) $(build-testdata) |