remove icpc currently due to issues on mac

jdtuck · Dec 17, 2019 · d98a9ce · d98a9ce
1 parent 7b662b8
commit d98a9ce
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/deps/src/fdaqmap/Makefile b/deps/src/fdaqmap/Makefile
@@ -1,14 +1,14 @@
 .PHONY : clean
 
 ERR = $(shell which icpc>/dev/null; echo $$?)
-ifeq "$(ERR)" "0"
-    CXX = icpc
-	CFLAGS =  -fPIC -O3 -g # C flags
-	LDFLAGS = -shared # linking flags
-else
+#ifeq "$(ERR)" "0"
+#    CXX = icpc
+#	CFLAGS =  -fPIC -O3 -g # C flags
+#	LDFLAGS = -shared # linking flags
+#else
 	CFLAGS =  -fPIC -std=c++11 -O3 -g  # C flags
 	LDFLAGS = -shared # linking flags
-endif
+#endif
 
 LIB=fdaqmap
 SUFFIX=so

diff --git a/deps/src/gropt/Makefile b/deps/src/gropt/Makefile
@@ -3,27 +3,27 @@
 OS := $(shell uname)
 ERR = $(shell which icpc>/dev/null; echo $$?)
 ifeq "$(OS)" "Darwin"
-	ifeq "$(ERR)" "0"
-		CXX = icpc
-		CFLAGS = -fPIC -std=c++11 -O3 -g -mkl
-		LDFLAGS = -shared
-		LIBS = -lmkl_rt -lpthread
-	else
+#	ifeq "$(ERR)" "0"
+#		CXX = icpc
+#		CFLAGS = -fPIC -std=c++11 -O3 -g -mkl
+#		LDFLAGS = -shared
+#		LIBS = -lmkl_rt -lpthread
+#	else
 		CFLAGS =  -fPIC -std=c++11 -O3 -g  # C flags
         	LDFLAGS = -shared # linking flags
         	LIBS = -lblas -llapack
-	endif
+#	endif
 else
-	ifeq "$(ERR)" "0"
-    		CXX = icpc
-		CFLAGS =  -fPIC -O3 -g # C flags
-		LDFLAGS = -shared # linking flags
-		LIBS = -lmkl_rt -lpthread
-	else
+#	ifeq "$(ERR)" "0"
+#    		CXX = icpc
+#		CFLAGS =  -fPIC -O3 -g # C flags
+#		LDFLAGS = -shared # linking flags
+#		LIBS = -lmkl_rt -lpthread
+#	else
 		CFLAGS =  -fPIC -std=c++11 -O3 -g  -L./destdir/lib # C flags
 		LDFLAGS = -shared # linking flags
 		LIBS = -lopenblas64_
-	endif
+#	endif
 endif
 
 LIB=gropt