aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2005-07-06 21:04:14 +0000
committerBruce Momjian <bruce@momjian.us>2005-07-06 21:04:14 +0000
commit261ffd03f72daf0c52973b6e928e6433d68ba92e (patch)
tree5b50c5890547f84dce0eb221c635e761169221cb /src
parenta9236028554ca0e11797c887373c1a34800a4fa6 (diff)
downloadpostgresql-261ffd03f72daf0c52973b6e928e6433d68ba92e.tar.gz
postgresql-261ffd03f72daf0c52973b6e928e6433d68ba92e.zip
Reverse out because the lack of using pgport in timezone/ is causing
problems: --------------------------------------------------------------------------- Support cross compilation by compiling "zic" with a native compiler. This relies on the output of zic being platform independent, but that is currently the case.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.global.in3
-rw-r--r--src/timezone/Makefile17
2 files changed, 5 insertions, 15 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 0735ecdcc4e..aea8d670895 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
# -*-makefile-*-
-# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.216 2005/07/05 23:13:57 tgl Exp $
+# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.217 2005/07/06 21:04:14 momjian Exp $
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -184,7 +184,6 @@ endif
endif # not PGXS
CC = @CC@
-CC_FOR_BUILD = @CC_FOR_BUILD@
GCC = @GCC@
CFLAGS = @CFLAGS@
diff --git a/src/timezone/Makefile b/src/timezone/Makefile
index fa3b9dadff8..d5fd05d0cd7 100644
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -4,7 +4,7 @@
# Makefile for the timezone library
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.20 2005/07/04 19:54:51 momjian Exp $
+# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.21 2005/07/06 21:04:14 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -18,7 +18,7 @@ override CPPFLAGS := $(CPPFLAGS) -I$(srcdir) -DNO_PGPORT
OBJS= localtime.o strftime.o pgtz.o
# files needed to build zic utility program
-ZICOBJS= zic.o ialloc.o scheck.o localtime-zic.o
+ZICOBJS= zic.o ialloc.o scheck.o localtime.o
# timezone data files
TZDATA := africa antarctica asia australasia europe northamerica southamerica \
@@ -30,17 +30,8 @@ all: SUBSYS.o submake-libpgport zic
SUBSYS.o: $(OBJS)
$(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS)
-# In case of cross-compilation, zic needs to be built with a native
-# compiler because it is run during the build, not on the final
-# system.
-
-localtime-zic.c: localtime.c
- $(LN_S) $< $@
-
-$(ZICOBJS): CC=$(CC_FOR_BUILD)
-
zic: $(ZICOBJS)
- $(CC_FOR_BUILD) $(CFLAGS) $(ZICOBJS) -o $@$(X)
+ $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
install: all installdirs
./zic -d $(DESTDIR)$(datadir)/timezone $(TZDATAFILES)
@@ -49,4 +40,4 @@ installdirs:
$(mkinstalldirs) $(DESTDIR)$(datadir)
clean distclean maintainer-clean:
- rm -f SUBSYS.o zic zic$(X) $(OBJS) $(ZICOBJS) localtime-zic.c
+ rm -f SUBSYS.o zic$(X) $(OBJS) $(ZICOBJS)