Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commiteaa088e

Browse files
committed
Fix new timezone cross-compile rule to avoid a bug in gmake 3.78.1;
document change.
1 parent9f910a3 commiteaa088e

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

‎src/timezone/Makefile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for the timezone library
55

66
# IDENTIFICATION
7-
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.30 2009/01/05 10:25:59 petere Exp $
7+
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.31 2009/01/06 02:25:29 momjian Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -38,12 +38,20 @@ ifeq (,$(with_system_tzdata))
3838
all: submake-libpgport zic
3939
endif
4040

41+
# We could do this test in the action section:
42+
#$(if $(ZIC),$(ZIC),./zic)
43+
# but gmake versions <= 3.78.1 or perhaps later have a bug
44+
# that causes a segfault; gmake 3.81 or later fixes this.
45+
ifeq (,$(ZIC))
46+
ZIC= ./zic
47+
endif
48+
4149
zic:$(ZICOBJS)
4250
$(CC)$(CFLAGS)$(ZICOBJS)$(LDFLAGS)$(LIBS) -o$@$(X)
4351

4452
install: all installdirs
4553
ifeq (,$(with_system_tzdata))
46-
$(if $(ZIC),$(ZIC),./zic) -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES)
54+
$(ZIC) -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES)
4755
endif
4856
$(MAKE) -C tznames $@
4957

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp