Skip to content

Commit 14108f0

Browse files
committed
Merge pull request #356 from libgit2/fix-linking-against-new-libssh2-formula
Fix linking against new libssh2 formula
2 parents 8b5b37d + 2614e4c commit 14108f0

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

External/libcrypto.a

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/usr/local/opt/openssl/lib/libcrypto.a

External/libssl.a

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/usr/local/opt/openssl/lib/libssl.a

ObjectiveGitFramework.xcodeproj/project.pbxproj

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,6 @@
208208
88746CC517FA1C950005888A /* GTRepository+Committing.h in Headers */ = {isa = PBXBuildFile; fileRef = 88746CC217FA1C950005888A /* GTRepository+Committing.h */; settings = {ATTRIBUTES = (Public, ); }; };
209209
88746CC617FA1C950005888A /* GTRepository+Committing.m in Sources */ = {isa = PBXBuildFile; fileRef = 88746CC317FA1C950005888A /* GTRepository+Committing.m */; };
210210
88746CC717FA1C950005888A /* GTRepository+Committing.m in Sources */ = {isa = PBXBuildFile; fileRef = 88746CC317FA1C950005888A /* GTRepository+Committing.m */; };
211-
887DAFFC15CB1CBD00F30D0D /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 887DAFFB15CB1CBD00F30D0D /* libcrypto.dylib */; };
212-
887DAFFD15CB1CE200F30D0D /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 887DAFF915CB1C9F00F30D0D /* libssl.dylib */; };
213211
88948AC91779243600809CDA /* GTObjectDatabaseSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88948AC81779243600809CDA /* GTObjectDatabaseSpec.m */; };
214212
88A994BA16FCE7D400402C7B /* GTBranchSpec.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994B916FCE7D400402C7B /* GTBranchSpec.m */; };
215213
88A994CB16FCED1D00402C7B /* GTTestCase.m in Sources */ = {isa = PBXBuildFile; fileRef = 88A994CA16FCED1D00402C7B /* GTTestCase.m */; };
@@ -447,8 +445,6 @@
447445
88746CC217FA1C950005888A /* GTRepository+Committing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTRepository+Committing.h"; sourceTree = "<group>"; };
448446
88746CC317FA1C950005888A /* GTRepository+Committing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTRepository+Committing.m"; sourceTree = "<group>"; };
449447
887DAFF615CB1C8000F30D0D /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
450-
887DAFF915CB1C9F00F30D0D /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; };
451-
887DAFFB15CB1CBD00F30D0D /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; };
452448
88948AC81779243600809CDA /* GTObjectDatabaseSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTObjectDatabaseSpec.m; sourceTree = "<group>"; };
453449
88A994B916FCE7D400402C7B /* GTBranchSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBranchSpec.m; sourceTree = "<group>"; };
454450
88A994C916FCED1D00402C7B /* GTTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTTestCase.h; sourceTree = "<group>"; };
@@ -579,8 +575,6 @@
579575
buildActionMask = 2147483647;
580576
files = (
581577
4D103ADD1819CFAA0029DB24 /* libiconv.dylib in Frameworks */,
582-
887DAFFD15CB1CE200F30D0D /* libssl.dylib in Frameworks */,
583-
887DAFFC15CB1CBD00F30D0D /* libcrypto.dylib in Frameworks */,
584578
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */,
585579
8803DA871313145700E6E818 /* libz.dylib in Frameworks */,
586580
);
@@ -643,8 +637,6 @@
643637
children = (
644638
4D103ADC1819CFAA0029DB24 /* libiconv.dylib */,
645639
188DC01817FC1571007350CD /* libz.dylib */,
646-
887DAFF915CB1C9F00F30D0D /* libssl.dylib */,
647-
887DAFFB15CB1CBD00F30D0D /* libcrypto.dylib */,
648640
8803DA861313145700E6E818 /* libz.dylib */,
649641
04DB4671133AB5FE00D9C624 /* libz.dylib */,
650642
6A1F2FD317C6A8F3003DFADE /* libcrypto.a */,
@@ -1510,6 +1502,8 @@
15101502
"-force_load",
15111503
External/libgit2.a,
15121504
/usr/local/lib/libssh2.a,
1505+
"-lcrypto",
1506+
"-lssl",
15131507
);
15141508
PRODUCT_NAME = ObjectiveGit;
15151509
USER_HEADER_SEARCH_PATHS = "";
@@ -1531,6 +1525,8 @@
15311525
"-force_load",
15321526
External/libgit2.a,
15331527
/usr/local/lib/libssh2.a,
1528+
"-lcrypto",
1529+
"-lssl",
15341530
);
15351531
PRODUCT_NAME = ObjectiveGit;
15361532
USER_HEADER_SEARCH_PATHS = "";
@@ -1709,6 +1705,8 @@
17091705
"-force_load",
17101706
External/libgit2.a,
17111707
/usr/local/lib/libssh2.a,
1708+
"-lcrypto",
1709+
"-lssl",
17121710
);
17131711
PRODUCT_NAME = ObjectiveGit;
17141712
USER_HEADER_SEARCH_PATHS = "";

0 commit comments

Comments
 (0)