projects
/
c11concurrency-benchmarks.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
30b5bf7
)
remove conflict
author
root
<root@dw-6.eecs.uci.edu>
Fri, 5 Jul 2019 19:34:27 +0000
(12:34 -0700)
committer
root
<root@dw-6.eecs.uci.edu>
Fri, 5 Jul 2019 19:34:27 +0000
(12:34 -0700)
mabain/src/Makefile
patch
|
blob
|
history
diff --git
a/mabain/src/Makefile
b/mabain/src/Makefile
index 058557ba9659cc6283a66509febfae0f0d68aaa5..adb615ed25856498964a60d7380fdc344b479da8 100644
(file)
--- a/
mabain/src/Makefile
+++ b/
mabain/src/Makefile
@@
-1,15
+1,11
@@
-CPP=clang++
+CPP=
../../
clang++
TARGET=libmabain.so
all: $(TARGET)
TARGET=libmabain.so
all: $(TARGET)
-<<<<<<< HEAD
-CFLAGS = -Xclang -load -Xclang /scratch/llvm-project/build/lib/libCDSPass.so -I. -I.. -Iutil -Wall -Werror -c -Wwrite-strings -Wsign-compare -Wcast-align -Wformat-security -fdiagnostics-show-option
+CFLAGS = -I. -I.. -Iutil -Wall -Werror -c -Wwrite-strings -Wsign-compare -Wcast-align -Wformat-security -fdiagnostics-show-option
CFLAGS += -g -ggdb -fPIC -O2 -std=c++11
CFLAGS += -g -ggdb -fPIC -O2 -std=c++11
-=======
-CFLAGS = -Xclang -load -Xclang /scratch/llvm/build/lib/libCDSPass.so -I. -I.. -Iutil -Wall -Werror -c -Wwrite-strings -Wsign-compare -Wcast-align -Wformat-security -fdiagnostics-show-option
-CFLAGS += -g -ggdb -fPIC -O1 -std=c++11
->>>>>>> e6990e6549277f6415536f7584bda1b584e194b7
+
CFLAGS += -D__SHM_LOCK__ -D__LOCK_FREE__ -D__SHM_QUEUE__
LDFLAGS = -pthread
CFLAGS += -D__SHM_LOCK__ -D__LOCK_FREE__ -D__SHM_QUEUE__
LDFLAGS = -pthread