summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/Makefile.mingw7
1 files changed, 0 insertions, 7 deletions
diff --git a/config/Makefile.mingw b/config/Makefile.mingw
index b38479a13e..7ee6c352b6 100644
--- a/config/Makefile.mingw
+++ b/config/Makefile.mingw
@@ -114,14 +114,7 @@ CFLAGS = -O -mms-bitfields -Wall -Wno-unused -fno-tree-vrp
# and only works on GCC 4.2 and later.
CPPFLAGS = -DCAML_NAME_SPACE
OCAMLC_CFLAGS = -O -mms-bitfields
-||||||| merged common ancestors
-BYTECC=$(TOOLPREF)gcc -O -mms-bitfields
-BYTECODE_C_COMPILER=$(BYTECC)
-### Additional compile-time options for $(BYTECC). (For static linking.)
-BYTECCCOMPOPTS=-DCAML_NAME_SPACE -Wall -Wno-unused
-
-### Additional compile-time options for $(BYTECC). (For debug version.)
BYTECCDBGCOMPOPTS=-g
LDFLAGS=