diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-05-25 04:37:40 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-25 04:37:40 +0400 |
| commit | 5bc2dc29d482448f2bdc0e9bbcb6e2d8a89d9c6a (patch) | |
| tree | ff205041e4b12a10f2106300be7b53135264dc29 /contrib | |
| parent | bd578b507fa79f94009ae1c1a436dc14cf7e6002 (diff) | |
| parent | c4649188e9140c960cec54798b153382fb4d6191 (diff) | |
Sync with maint
By Jeff King (1) and Junio C Hamano (1)
* maint:
Update draft release notes to 1.7.10.3
osxkeychain: pull make config from top-level directory
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/credential/osxkeychain/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/contrib/credential/osxkeychain/Makefile b/contrib/credential/osxkeychain/Makefile index 75c07f8be4..4b3a08a2ba 100644 --- a/contrib/credential/osxkeychain/Makefile +++ b/contrib/credential/osxkeychain/Makefile @@ -2,10 +2,13 @@ all:: git-credential-osxkeychain CC = gcc RM = rm -f -CFLAGS = -g -Wall +CFLAGS = -g -O2 -Wall + +-include ../../../config.mak.autogen +-include ../../../config.mak git-credential-osxkeychain: git-credential-osxkeychain.o - $(CC) -o $@ $< -Wl,-framework -Wl,Security + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -Wl,-framework -Wl,Security git-credential-osxkeychain.o: git-credential-osxkeychain.c $(CC) -c $(CFLAGS) $< |