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

Commit36a1a8c

Browse files
committed
Don't link pg_isolation_regress with libpq
It's not necessary and can only create confusion about which libpqinstallation should be used.Also remove some dead code from the makefile that was apparentlycopied from elsewhere.
1 parent89c2f57 commit36a1a8c

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

‎src/test/isolation/Makefile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ include $(top_builddir)/src/Makefile.global
99
# where to find psql for testing an existing installation
1010
PSQLDIR =$(bindir)
1111

12-
ifeq ($(PORTNAME), win32)
13-
LDLIBS += -lws2_32
14-
endif
15-
1612
overrideCPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress$(CPPFLAGS)
17-
overrideLDLIBS :=$(libpq_pgport)$(LDLIBS)
1813

1914
OBJS = specparse.o isolationtester.o
2015

@@ -25,12 +20,12 @@ pg_regress.o: | submake-regress
2520
rm -f$@&&$(LN_S)$(top_builddir)/src/test/regress/pg_regress.o.
2621

2722
pg_isolation_regress: isolation_main.o pg_regress.o
28-
$(CC)$(CFLAGS)$^$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
23+
$(CC)$(CFLAGS)$^$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
2924

3025
all: isolationtester pg_isolation_regress
3126

3227
isolationtester:$(OBJS) | submake-libpq submake-libpgport
33-
$(CC)$(CFLAGS)$(OBJS)$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
28+
$(CC)$(CFLAGS)$^$(libpq_pgport)$(LDFLAGS)$(LDFLAGS_EX)$(LIBS) -o$@$(X)
3429

3530
distprep: specparse.c specscanner.c
3631

0 commit comments

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