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

Commitc5c7fa2

Browse files
committed
Fix program build rule in src/bin/scripts/Makefile.
Commit69ae9dc added a globally-visible "%: %.o" rule, but we failedto notice that src/bin/scripts/Makefile already had such a rule.Apparently, the later occurrence of the same rule wins in nearly allversions of gmake ... but not in the one used by buildfarm member jacana.jacana is evidently using the global rule, which says to link "$<",ie just the first dependency. But the scripts makefile needs tolink "$^", ie all the dependencies listed for the target.There is, fortunately, no good reason not to use "$^" in the globalversion of the rule, so we can just do that and get rid of the localversion.
1 parent807ae41 commitc5c7fa2

File tree

2 files changed

+9
-12
lines changed

2 files changed

+9
-12
lines changed

‎src/Makefile.global.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ endif
747747
# since we put -l switches into LDFLAGS and those are order-sensitive.
748748
# In addition, include CFLAGS and LDFLAGS_EX per project conventions.
749749
%:%.o
750-
$(CC)$(CFLAGS)$<$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
750+
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
751751

752752
ifndefPGXS
753753

‎src/bin/scripts/Makefile

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,14 @@ LDFLAGS_INTERNAL += -L$(top_builddir)/src/fe_utils -lpgfeutils $(libpq_pgport)
2323

2424
all:$(PROGRAMS)
2525

26-
%:%.o$(WIN32RES)
27-
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
28-
29-
createdb: createdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils
30-
createuser: createuser.o common.o | submake-libpq submake-libpgport submake-libpgfeutils
31-
dropdb: dropdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils
32-
dropuser: dropuser.o common.o | submake-libpq submake-libpgport submake-libpgfeutils
33-
clusterdb: clusterdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils
34-
vacuumdb: vacuumdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils
35-
reindexdb: reindexdb.o common.o | submake-libpq submake-libpgport submake-libpgfeutils
36-
pg_isready: pg_isready.o common.o | submake-libpq submake-libpgport submake-libpgfeutils
26+
createdb: createdb.o common.o$(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils
27+
createuser: createuser.o common.o$(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils
28+
dropdb: dropdb.o common.o$(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils
29+
dropuser: dropuser.o common.o$(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils
30+
clusterdb: clusterdb.o common.o$(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils
31+
vacuumdb: vacuumdb.o common.o$(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils
32+
reindexdb: reindexdb.o common.o$(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils
33+
pg_isready: pg_isready.o common.o$(WIN32RES) | submake-libpq submake-libpgport submake-libpgfeutils
3734

3835
install: all installdirs
3936
$(INSTALL_PROGRAM) createdb$(X)'$(DESTDIR)$(bindir)'/createdb$(X)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp