use osx.mk to simplify travis OSX build

dmlc · Oct 20, 2015 · 1eb7ebc · 1eb7ebc
1 parent 0257055
commit 1eb7ebc
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/test/travis/build_mxnet.sh b/test/travis/build_mxnet.sh
@@ -4,19 +4,18 @@ git clone --recursive https://github.com/dmlc/mxnet __mxnet_build
 cd __mxnet_build
 
 if [ ! -f config.mk ]; then
-  echo "Use the default config.m"
-  cp make/config.mk config.mk
-
   if [ ${TRAVIS_OS_NAME} == "linux" ]; then
+    cp make/config.mk config.mk
     sed -i 's/export CC = gcc/export CC = gcc-4.8/g' config.mk
     sed -i 's/export CXX = g++/export CXX = g++-4.8/g' config.mk
   fi
 
   if [ ${TRAVIS_OS_NAME} == "osx" ]; then
-    # add built-in blas header file to path
-    sed -i -s 's%ADD_CFLAGS =%ADD_CFLAGS = -I/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Versions/Current/Headers/%' config.mk
-    # disable openmp
-    sed -i -s 's%USE_OPENMP = 1%USE_OPENMP = 0%g' config.mk
+    cp make/osx.mk config.mk
+    ## add built-in blas header file to path
+    #sed -i -s 's%ADD_CFLAGS =%ADD_CFLAGS = -I/System/Library/Frameworks/Accelerate.framework/Versions/Current/Frameworks/vecLib.framework/Versions/Current/Headers/%' config.mk
+    ## disable openmp
+    #sed -i -s 's%USE_OPENMP = 1%USE_OPENMP = 0%g' config.mk
   fi
 fi