aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2016-07-08 11:35:15 +0200
committerClifford Wolf <clifford@clifford.at>2016-07-08 11:35:15 +0200
commit6bda61292513cbe7ffd69b4e3462b849757d2337 (patch)
tree99d39ee3f331fc1e7c731b1aa4113d388303fccb
parentf6b7cf23d65c8e86cbfb742f30167dcc89825cbd (diff)
downloadyosys-6bda61292513cbe7ffd69b4e3462b849757d2337.tar.gz
yosys-6bda61292513cbe7ffd69b4e3462b849757d2337.tar.bz2
yosys-6bda61292513cbe7ffd69b4e3462b849757d2337.zip
Undo eddiehung-vtr Makefile changes
-rw-r--r--Makefile6
1 files changed, 1 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index fee099a02..7ed68ef42 100644
--- 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