Address reviewer's comment: test gcc on Mac

dmlc · Dec 24, 2019 · 25bcdec · 25bcdec
1 parent 12aec58
commit 25bcdec
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -43,6 +43,7 @@ addons:
       - g++-4.8
   homebrew:
     packages:
+      - gcc@8
       - cmake
       - libomp
       - python3

diff --git a/make/dmlc.mk b/make/dmlc.mk
@@ -20,11 +20,9 @@ else
 endif
 
 ifneq ($(USE_OPENMP), 0)
-ifneq ($(UNAME), Darwin)
 	DMLC_CFLAGS += -fopenmp
 	DMLC_LDFLAGS += -fopenmp
 endif
-endif
 
 ifeq (-android, $(findstring -android,$(MACHINE)))
 #$(info $$MACHINE is [${MACHINE}])

diff --git a/scripts/travis/travis_script.sh b/scripts/travis/travis_script.sh
@@ -22,8 +22,9 @@ if [[ ${TASK} == "unittest_gtest" ]]; then
         export CXX=g++-4.8
     else
         echo "USE_S3=0" >> config.mk
-        # OpenMP is only available on Mac OSX when CMake is used
-        echo "USE_OPENMP=0" >> config.mk
+        echo "USE_OPENMP=1" >> config.mk
+        echo "export CXX=g++-8" >> config.mk
+        export CXX=g++-8
     fi
     make -f scripts/packages.mk gtest
     echo "GTEST_PATH="${CACHE_PREFIX} >> config.mk