Hendrik/xgboost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed OpenMP installation on MacOSX with gcc-6 (#1460)

Browse Source 
* Fixed OpenMP installation on MacOSX with gcc-6

- Modified makefile from gcc-5 to gcc-6
- Removed deprecated install instructions from doc (gcc-5 was automatically forced if available in makefile on OSX)

* Fixed OpenMP installation on MacOSX with gcc-6

- Modified makefile from gcc-5 to gcc-6
- Removed deprecated install instructions from doc (gcc-5 was automatically forced if available in makefile on OSX)
This commit is contained in:
Francesco Mosconi
2016-08-22 10:30:34 -07:00
committed by Tianqi Chen
parent 93e85139bc
commit d754ce7dc1
3 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -33,18 +33,18 @@ include $(XGB_PLUGINS)
# use customized config file
ifndef CC
export CC = $(if $(shell which gcc-5),gcc-5,gcc)
export CC = $(if $(shell which gcc-6),gcc-6,gcc)
endif
ifndef CXX
export CXX = $(if $(shell which g++-5),g++-5,g++)
export CXX = $(if $(shell which g++-6),g++-6,g++)
endif
# on Mac OS X, force brew gcc-5, since the Xcode c++ fails anyway
# on Mac OS X, force brew gcc-6, since the Xcode c++ fails anyway
# it is useful for pip install compiling-on-the-fly
OS := $(shell uname)
ifeq ($(OS), Darwin)
export CC = $(if $(shell which gcc-5),gcc-5,clang)
export CXX = $(if $(shell which g++-5),g++-5,clang++)
export CC = $(if $(shell which gcc-6),gcc-6,clang)
export CXX = $(if $(shell which g++-6),g++-6,clang++)
endif
export LDFLAGS= -pthread -lm $(ADD_LDFLAGS) $(DMLC_LDFLAGS) $(PLUGIN_LDFLAGS)