Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

FLEXLINK flag to handle OCaml >= 3.11 on Windows

  • Loading branch information...
commit a0eb8ae5b9d789d62959ba466f245e188799764b 1 parent d1a90f4
@kerneis kerneis authored
Showing with 17 additions and 4 deletions.
  1. +17 −4 ocamlutil/Makefile.ocaml
View
21 ocamlutil/Makefile.ocaml
@@ -243,8 +243,13 @@ ifdef NATIVECAML
COMPILE_FLAGS += -S
endif
ifdef STATIC
- COMPILE_FLAGS += -ccopt -static
- LINK_FLAGS += -ccopt -static
+ ifdef FLEXLINK
+ COMPILE_FLAGS += -ccopt "-link -static"
+ LINK_FLAGS += -ccopt "-link -static"
+ else
+ COMPILE_FLAGS += -ccopt -static
+ LINK_FLAGS += -ccopt -static
+ endif
endif
#foo := $(shell echo "I am in NATIVECAML mode" >&2; echo whatever)
CAMLC = $(CAMLDIR)ocamlopt $(COMPILE_FLAGS)
@@ -288,11 +293,19 @@ ifdef CAML_NOOPT
COMPILE_FLAGS += -ccopt /Zi -ccopt /Od
LINK_FLAGS += -ccopt /Zi -ccopt /Od
else
- COMPILE_FLAGS += -g -ccopt -g
+ ifdef FLEXLINK
+ COMPILE_FLAGS += -g -ccopt "-link -g"
+ else
+ COMPILE_FLAGS += -g -ccopt -g
+ endif
ifdef MINGW
LINK_FLAGS += -g
else
- LINK_FLAGS += -g -ccopt -g
+ ifdef FLEXLINK
+ LINK_FLAGS += -g -ccopt "-link -g"
+ else
+ LINK_FLAGS += -g -ccopt -g
+ endif
endif
endif
else
Please sign in to comment.
Something went wrong with that request. Please try again.