diff options
| author | Pieter Wuille <[email protected]> | 2013-06-22 10:04:58 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2013-06-22 10:04:58 -0700 |
| commit | cccd17a1b28357380c785a2366ab21771705ea71 (patch) | |
| tree | 6ca18d8b3a29d6d5db0e3ca85bf4c1aa05ddab9d | |
| parent | Merge pull request #2632 from mikehearn/chainparams (diff) | |
| parent | Update HomeBrew osx makefile patch to account for recent changes to makefile (diff) | |
| download | discoin-cccd17a1b28357380c785a2366ab21771705ea71.tar.xz discoin-cccd17a1b28357380c785a2366ab21771705ea71.zip | |
Merge pull request #2768 from fanquake/brew-makefile-patch-fix
Update HomeBrew makefile patch
| -rw-r--r-- | contrib/homebrew/makefile.osx.patch | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/homebrew/makefile.osx.patch b/contrib/homebrew/makefile.osx.patch index 340de0efd..287db2fdf 100644 --- a/contrib/homebrew/makefile.osx.patch +++ b/contrib/homebrew/makefile.osx.patch @@ -1,5 +1,5 @@ diff --git a/src/makefile.osx b/src/makefile.osx -index 8b7c559..8a0560c 100644 +index bef0ef3..07ef8d3 100644 --- a/src/makefile.osx +++ b/src/makefile.osx @@ -7,17 +7,21 @@ @@ -28,7 +28,7 @@ index 8b7c559..8a0560c 100644 USE_UPNP:=1 USE_IPV6:=1 -@@ -31,13 +35,13 @@ ifdef STATIC +@@ -31,14 +35,14 @@ ifdef STATIC TESTLIBS += \ $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a LIBS += \ @@ -38,6 +38,7 @@ index 8b7c559..8a0560c 100644 $(DEPSDIR)/lib/libboost_filesystem-mt.a \ $(DEPSDIR)/lib/libboost_program_options-mt.a \ $(DEPSDIR)/lib/libboost_thread-mt.a \ + $(DEPSDIR)/lib/libboost_chrono-mt.a \ - $(DEPSDIR)/lib/libssl.a \ - $(DEPSDIR)/lib/libcrypto.a \ + $(OPENSSLDIR)/lib/libssl.a \ |