Merge

diff --git a/mabain/src/Makefile b/mabain/src/Makefile
index 27ae5f57416fef284f6857e87b55b5679b3a55dd..058557ba9659cc6283a66509febfae0f0d68aaa5 100644 (file)
--- a/mabain/src/Makefile
+++ b/mabain/src/Makefile
@@ -3,10 +3,15 @@ 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 += -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 = -lpthread
+LDFLAGS = -pthread
 
 SOURCES = $(wildcard *.cpp) $(wildcard util/*.cpp)
 HEADERS = $(wildcard *.h) $(wildcard util/*.h)