From dbc4655f815069ae8e5f98bf27dd80c2c6a5f76e Mon Sep 17 00:00:00 2001 From: Leonard Truong Date: Tue, 7 Oct 2014 14:47:37 -0700 Subject: [PATCH 1/2] Add support for building on yosemite --- Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 5fb597c0d60..052d9f6b482 100644 --- a/Makefile +++ b/Makefile @@ -249,6 +249,10 @@ ifeq ($(OSX), 1) CXXFLAGS += -stdlib=libstdc++ LINKFLAGS += -stdlib=libstdc++ endif + ifneq ($(findstring 10.10, $(shell sw_vers -productVersion)),) + CXXFLAGS += -stdlib=libstdc++ + LINKFLAGS += -stdlib=libstdc++ + endif # boost::thread is called boost_thread-mt to mark multithreading on OS X LIBRARIES += boost_thread-mt NVCCFLAGS += -DOSX @@ -312,10 +316,15 @@ else LIBRARIES += cblas atlas endif else ifeq ($(OSX), 1) - # OS X packages atlas as the vecLib framework - BLAS_INCLUDE ?= /System/Library/Frameworks/vecLib.framework/Versions/Current/Headers/ LIBRARIES += cblas - LDFLAGS += -framework vecLib + ifneq ($(findstring 10.10, $(shell sw_vers -productVersion)),) + BLAS_INCLUDE ?= /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Headers/ + LDFLAGS += -framework Accelerate + else + # OS X packages atlas as the vecLib framework + BLAS_INCLUDE ?= /System/Library/Frameworks/vecLib.framework/Versions/Current/Headers/ + LDFLAGS += -framework vecLib + endif endif endif INCLUDE_DIRS += $(BLAS_INCLUDE) From ca5c600288e08f5db70c96d82873de1339c4d1de Mon Sep 17 00:00:00 2001 From: Leonard Truong Date: Thu, 18 Dec 2014 13:52:40 -0800 Subject: [PATCH 2/2] Update new BLAS_INCLUDE for Xcode 6, not just Yosemite --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 96d2373d765..4d78b62d8ef 100644 --- a/Makefile +++ b/Makefile @@ -316,7 +316,7 @@ else endif else ifeq ($(OSX), 1) LIBRARIES += cblas - ifneq ($(findstring 10.10, $(shell sw_vers -productVersion)),) + ifneq ($(findstring Xcode 6, $(shell xcodebuild -version)),) BLAS_INCLUDE ?= /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Headers/ LDFLAGS += -framework Accelerate else