From 51e685a13034c9bbc8e7bc7c6a34819c409fdfe3 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 5 Jul 2019 12:34:27 -0700 Subject: [PATCH] remove conflict --- mabain/src/Makefile | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/mabain/src/Makefile b/mabain/src/Makefile index 058557b..adb615e 100644 --- a/mabain/src/Makefile +++ b/mabain/src/Makefile @@ -1,15 +1,11 @@ -CPP=clang++ +CPP=../../clang++ 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 = -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 -- 2.34.1