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

Commitefa81e3

Browse files
committed
Fix bogus handling of $(X) (i.e., ".exe") in isolationtester Makefile.
I'm not sure why commit1eb1dde seemsto have made this start to fail on Cygwin when it never did before ---but nonetheless, the coding was pretty bogus, and unlike the way wehandle $(X) anywhere else. Per buildfarm.
1 parentc22acf4 commitefa81e3

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

‎src/test/isolation/Makefile

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@ override LDLIBS := $(libpq_pgport) $(LDLIBS)
1818

1919
OBJS = specparse.o isolationtester.o
2020

21+
all: isolationtester$(X) pg_isolation_regress$(X)
22+
2123
submake-regress:
2224
$(MAKE) -C$(top_builddir)/src/test/regress pg_regress.o
2325

2426
pg_regress.o: | submake-regress
2527
rm -f$@&&$(LN_S)$(top_builddir)/src/test/regress/pg_regress.o.
2628

27-
pg_isolation_regress: isolation_main.o pg_regress.o
28-
$(CC)$(CFLAGS)$^$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
29-
30-
all: isolationtester pg_isolation_regress
29+
pg_isolation_regress$(X): isolation_main.o pg_regress.o
30+
$(CC)$(CFLAGS)$^$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@
3131

32-
isolationtester:$(OBJS) | submake-libpq submake-libpgport
33-
$(CC)$(CFLAGS)$(OBJS)$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
32+
isolationtester$(X):$(OBJS) | submake-libpq submake-libpgport
33+
$(CC)$(CFLAGS)$(OBJS)$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@
3434

3535
distprep: specparse.c specscanner.c
3636

@@ -41,8 +41,6 @@ distprep: specparse.c specscanner.c
4141
# important, otherwise make will choose the built-in rule for
4242
# gram.y=>gram.c.
4343

44-
all: isolationtester$(X) pg_isolation_regress$(X)
45-
4644
specparse.h: specparse.c ;
4745

4846
# specscanner is compiled as part of specparse

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp