NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit69e9768

committed

ecpg: Improve test building

Further improve on commitc75e143.Instead of building both .o files and binaries in the same make rule,just rely on the normal .c -> .o rule. This will ensure thatdependency tracking is used when enabled. To do this, disable theimplicit direct .c -> binary rule globally, which will also preventthe original problem (*.dSYM junk) from reappearing elsewhere.

1 parent0ed7445 commit69e9768Copy full SHA for 69e9768

File tree

2 files changed

-3

lines changed

src
- Makefile.global.in
- interfaces/ecpg/test
  - Makefile.regress

2 files changed

-3

lines changed

`‎src/Makefile.global.in`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -515,6 +515,12 @@ TAS = @TAS@`
`515`	`515`	`%.bz2:%`
`516`	`516`	`$(BZIP2) -c$<>$@`
`517`	`517`
	`518`	`+# Direct builds of foo.c -> foo are disabled to avoid generating`
	`519`	`+# *.dSYM junk on Macs. All builds should normally go through the`
	`520`	`+# foo.c -> foo.o -> foo steps. This also ensures that dependency`
	`521`	`+# tracking (see below) is used.`
	`522`	`+%:%.c`
	`523`	`+`
`518`	`524`	`ifndefPGXS`
`519`	`525`
`520`	`526`	`# Remake Makefile.global from Makefile.global.in if the latter`

`‎src/interfaces/ecpg/test/Makefile.regress`

Lines changed: 2 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,8 @@ override LIBS := -lecpg -lpgtypes $(filter -l%, $(libpq)) $(LIBS) $(PTHREAD_LIBS`
`7`	`7`
`8`	`8`	`ECPG = ../../preproc/ecpg --regression -I$(srcdir)/../../include`
`9`	`9`
`10`		`-%: %.c`
`11`		`-$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o`
`12`		`-$(CC) $(CPPFLAGS) $(CFLAGS) $*.o $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@`
	`10`	`+%: %.o`
	`11`	`+$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@`
`13`	`12`
`14`	`13`	`%.c: %.pgc ../regression.h`
`15`	`14`	`$(ECPG) -o $@ -I$(srcdir) $<`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit69e9768

File tree

2 files changed

2 files changed

`‎src/Makefile.global.in`

`‎src/interfaces/ecpg/test/Makefile.regress`

0 commit comments