Undo eddiehung-vtr Makefile changes

diff --git a/Makefile b/Makefile
index fee099a02e9b8a5b0f71bd60e0eb609501ee52bc..7ed68ef420863808495c26e60b15f842c712af13 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 
-CONFIG := icc
+CONFIG := clang
 # CONFIG := gcc
 # CONFIG := gcc-4.8
 # CONFIG := emcc
@@ -172,10 +172,6 @@ ABCMKARGS += ARCHFLAGS="-DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4 -DWIN32
 ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" ABC_USE_NO_READLINE=1 CC="$(CXX)" CXX="$(CXX)"
 EXE = .exe
 
-else ifeq ($(CONFIG),icc)
-CXX = icpc
-CXXFLAGS += -std=gnu++0x -Os
-
 else ifneq ($(CONFIG),none)
 $(error Invalid CONFIG setting '$(CONFIG)'. Valid values: clang, gcc, gcc-4.8, emcc, none)
 endif