projects
/
c11concurrency-benchmarks.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/git/concurrency-benchmarks
[c11concurrency-benchmarks.git]
/
silo
/
Makefile
diff --git
a/silo/Makefile
b/silo/Makefile
index 0c0f04fd2693ae31591f65b78d5aad2afb983ec8..1b0012666a1e0048bc777d756a47e0db65f8e821 100644
(file)
--- a/
silo/Makefile
+++ b/
silo/Makefile
@@
-2,6
+2,9
@@
### Options ###
### Options ###
+CC=../gcc
+CXX=../g++
+
DEBUG ?= 0
CHECK_INVARIANTS ?= 0
DEBUG ?= 0
CHECK_INVARIANTS ?= 0
@@
-80,7
+83,7
@@
CXXFLAGS += -MD -Ithird-party/lz4 -DCONFIG_H=\"$(CONFIG_H)\"
ifeq ($(DEBUG_S),1)
CXXFLAGS += -fno-omit-frame-pointer -DDEBUG
else
ifeq ($(DEBUG_S),1)
CXXFLAGS += -fno-omit-frame-pointer -DDEBUG
else
- CXXFLAGS += -
Werror -
O2 -funroll-loops -fno-omit-frame-pointer
+ CXXFLAGS += -O2 -funroll-loops -fno-omit-frame-pointer
endif
ifeq ($(CHECK_INVARIANTS_S),1)
CXXFLAGS += -DCHECK_INVARIANTS
endif
ifeq ($(CHECK_INVARIANTS_S),1)
CXXFLAGS += -DCHECK_INVARIANTS