aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/c/Makefile6
1 files changed, 0 insertions, 6 deletions
diff --git a/test/c/Makefile b/test/c/Makefile
index 85ffef43..9b42563a 100644
--- a/test/c/Makefile
+++ b/test/c/Makefile
@@ -1,13 +1,7 @@
include ../../Makefile.config
CCOMP=../../ccomp
-<<<<<<< HEAD
CCOMPFLAGS=$(CCOMPOPTS) -stdlib ../../runtime -dc -dclight -dasm $(SSA_MODE)
-=======
-# TODO - temporary
-# CCOMPOPTS:=$(CCOMPOPTS) -fall-loads-nontrap -fduplicate 2 -fprepass
-CCOMPFLAGS=$(CCOMPOPTS) -stdlib ../../runtime -dc -dclight -dasm
->>>>>>> origin/kvx-work
CFLAGS+=-O2 -Wall
EXECUTE:=timeout --signal=SIGTERM 20s $(EXECUTE)