aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authoreddiehung <e.hung@imperial.ac.uk>2015-05-03 12:53:09 +0100
committereddiehung <e.hung@imperial.ac.uk>2015-05-03 12:53:09 +0100
commit7c623182393aa2e8445336a99f0cfd4bc7c7e88f (patch)
tree2ff4da2da0cc9ff9517c8e48eb434818dc7a1887 /Makefile
parent079c1205fec6d194114b3d031d78a23cb8e0e7f9 (diff)
downloadyosys-7c623182393aa2e8445336a99f0cfd4bc7c7e88f.tar.gz
yosys-7c623182393aa2e8445336a99f0cfd4bc7c7e88f.tar.bz2
yosys-7c623182393aa2e8445336a99f0cfd4bc7c7e88f.zip
Fix for all zero mask
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index f1188da2e..d41bec187 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-CONFIG := clang
+CONFIG := icc
# CONFIG := gcc
# CONFIG := gcc-4.6
# CONFIG := emcc
@@ -109,6 +109,10 @@ ABCMKARGS += ARCHFLAGS="-DSIZEOF_VOID_P=4 -DSIZEOF_LONG=4 -DSIZEOF_INT=4 -DWIN32
ABCMKARGS += LIBS="lib/x86/pthreadVC2.lib -s" READLINE=0 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.6, emcc, none)
endif