Skip to content
This repository was archived by the owner on Nov 9, 2017. It is now read-only.

Commit 17a9ac7

Browse files
peffgitster
authored andcommitted
osxkeychain: pull make config from top-level directory
The default compiler and cflags were mostly "works for me" when I built the original version. We need to be much less careful here than usual, because we know we are building only on OS X. But it's only polite to at least respect the CFLAGS and CC definitions that the user may have provided earlier. While we're at it, let's update our definitions and rules to be more like the top-level Makefile; default our CFLAGS to include -O2, and make sure we use CFLAGS and LDFLAGS when linking. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent cb8ad28 commit 17a9ac7

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

contrib/credential/osxkeychain/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ all:: git-credential-osxkeychain
22

33
CC = gcc
44
RM = rm -f
5-
CFLAGS = -g -Wall
5+
CFLAGS = -g -O2 -Wall
6+
7+
-include ../../../config.mak.autogen
8+
-include ../../../config.mak
69

710
git-credential-osxkeychain: git-credential-osxkeychain.o
8-
$(CC) -o $@ $< -Wl,-framework -Wl,Security
11+
$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) -Wl,-framework -Wl,Security
912

1013
git-credential-osxkeychain.o: git-credential-osxkeychain.c
1114
$(CC) -c $(CFLAGS) $<

0 commit comments

Comments
 (0)