summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorClifford Wolf <clifford@clifford.at>2014-07-31 23:14:17 +0200
committerClifford Wolf <clifford@clifford.at>2014-07-31 23:14:17 +0200
commit62c8a7152551519d6e876319b1068a1987a14f3c (patch)
tree0dc9b71e3411ea79a1ca8250129ebd247ef8abdc /Makefile
parent069fe0db4265aeed23b37bec252e81308daf8c65 (diff)
Various cleanups in Makefile, Renamed default configurations
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile33
1 files changed, 12 insertions, 21 deletions
diff --git a/Makefile b/Makefile
index 40eff3d0..41569f6c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,7 @@
-CONFIG := clang-debug
-# CONFIG := gcc-debug
+CONFIG := clang
+# CONFIG := gcc
# CONFIG := gcc-4.7
-# CONFIG := release
# features (the more the better)
ENABLE_TCL := 1
@@ -44,7 +43,7 @@ else
endif
YOSYS_VER := 0.3.0+
-GIT_REV := $(shell git rev-parse --short HEAD || echo UNKOWN)
+GIT_REV := $(shell git rev-parse --short HEAD 2> /dev/null || echo UNKOWN)
OBJS = kernel/version_$(GIT_REV).o
# set 'ABCREV = default' to use abc/ as it is
@@ -58,24 +57,19 @@ ABCPULL = 1
-include Makefile.conf
-ifeq ($(CONFIG),clang-debug)
+ifeq ($(CONFIG),clang)
CXX = clang
CXXFLAGS += -std=c++11 -Os
endif
-ifeq ($(CONFIG),gcc-debug)
+ifeq ($(CONFIG),gcc)
CXX = gcc
CXXFLAGS += -std=gnu++0x -Os
endif
ifeq ($(CONFIG),gcc-4.7)
CXX = gcc-4.7
-CXXFLAGS += -std=gnu++0x -march=native -O3
-endif
-
-ifeq ($(CONFIG),release)
-CXX = gcc
-CXXFLAGS += -std=gnu++0x -march=native -O3 -DNDEBUG
+CXXFLAGS += -std=gnu++0x -Os
endif
ifeq ($(ENABLE_TCL),1)
@@ -282,20 +276,17 @@ qtcreator:
config-clean: clean
rm -f Makefile.conf
-config-clang-debug: clean
- echo 'CONFIG := clang-debug' > Makefile.conf
+config-clang: clean
+ echo 'CONFIG := clang' > Makefile.conf
-config-gcc-debug: clean
- echo 'CONFIG := gcc-debug' > Makefile.conf
+config-gcc: clean
+ echo 'CONFIG := gcc' > Makefile.conf
config-gcc-4.7: clean
echo 'CONFIG := gcc-4.7' > Makefile.conf
-config-release: clean
- echo 'CONFIG := release' > Makefile.conf
-
config-gprof: clean
- echo 'CONFIG := gcc-debug' > Makefile.conf
+ echo 'CONFIG := gcc' > Makefile.conf
echo 'ENABLE_GPROF := 1' >> Makefile.conf
config-sudo:
@@ -309,5 +300,5 @@ config-sudo:
-include techlibs/*/*.d
.PHONY: all top-all abc test install install-abc manual clean mrproper qtcreator
-.PHONY: config-clean config-clang-debug config-gcc-debug config-release
+.PHONY: config-clean config-clang config-gcc config-gcc-4.7 config-gprof config-sudo