database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Fix bogus handling of $(X) (i.e., ".exe") in isolationtester Makefile.

Browse Source 
I'm not sure why commit 1eb1dde049 seems
to have made this start to fail on Cygwin when it never did before ---
but nonetheless, the coding was pretty bogus, and unlike the way we
handle $(X) anywhere else.  Per buildfarm.
This commit is contained in:
Tom Lane
2012-11-01 19:48:53 -04:00
parent 19e36477b3
commit ef28e05ac5
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/test/isolation/Makefile
View File

@ -13,19 +13,19 @@ override CPPFLAGS := -I$(srcdir) -I$(libpq_srcdir) -I$(srcdir)/../regress $(CPPF
OBJS = specparse.o isolationtester.o OBJS = specparse.o isolationtester.o
all: isolationtester$(X) pg_isolation_regress$(X)
submake-regress: submake-regress:
$(MAKE) -C $(top_builddir)/src/test/regress pg_regress.o $(MAKE) -C $(top_builddir)/src/test/regress pg_regress.o
pg_regress.o: | submake-regress pg_regress.o: | submake-regress
rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pg_regress.o . rm -f $@ && $(LN_S) $(top_builddir)/src/test/regress/pg_regress.o .
pg_isolation_regress: isolation_main.o pg_regress.o pg_isolation_regress$(X): isolation_main.o pg_regress.o
$(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X) $(CC) $(CFLAGS) $^ $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
all: isolationtester pg_isolation_regress isolationtester$(X): $(OBJS) | submake-libpq submake-libpgport
$(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@
isolationtester: $(OBJS) | submake-libpq submake-libpgport
$(CC) $(CFLAGS) $^ $(libpq_pgport) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
distprep: specparse.c specscanner.c distprep: specparse.c specscanner.c
@ -36,8 +36,6 @@ distprep: specparse.c specscanner.c
# important, otherwise make will choose the built-in rule for # important, otherwise make will choose the built-in rule for
# gram.y=>gram.c. # gram.y=>gram.c.
all: isolationtester$(X) pg_isolation_regress$(X)
specparse.h: specparse.c ; specparse.h: specparse.c ;
# specscanner is compiled as part of specparse # specscanner is compiled as part of specparse