diff options
| author | Benjamin Pierce <bcpierce00@gmail.com> | 2017-11-24 15:17:16 -0500 |
|---|---|---|
| committer | Benjamin Pierce <bcpierce00@gmail.com> | 2017-11-24 15:17:16 -0500 |
| commit | 66e84e33e4aceca37abe19325a2595bda83b23dd (patch) | |
| tree | 3838eb224bb57537deb985e468400280586430b3 | |
| parent | d62761d7c8a9f68d5c4c39b70ac8ab1ecbfb47d2 (diff) | |
| parent | c259583d4a899d3ffb88467d1a70121288eb702a (diff) | |
| download | unison-66e84e33e4aceca37abe19325a2595bda83b23dd.zip unison-66e84e33e4aceca37abe19325a2595bda83b23dd.tar.gz unison-66e84e33e4aceca37abe19325a2595bda83b23dd.tar.bz2 | |
Merge fix from master
| -rw-r--r-- | src/Makefile.OCaml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/Makefile.OCaml b/src/Makefile.OCaml index 427f131..fabd9d8 100644 --- a/src/Makefile.OCaml +++ b/src/Makefile.OCaml @@ -95,7 +95,7 @@ buildexecutable:: ### Default parameters # Generate backtrace information for exceptions -CAMLFLAGS+=-g +CAMLFLAGS+=-g -unsafe-string INCLFLAGS=-I lwt -I ubase -I system CAMLFLAGS+=$(INCLFLAGS) @@ -427,6 +427,8 @@ win32rc/unison.res.lib: win32rc/unison.res @echo "$(CAMLC): $< ---> $@" $(CAMLC) $(CAMLFLAGS) -c $(CWD)/$< +fswatch.cmi : ubase/prefs.cmi + %.cmo: %.ml @echo "$(OCAMLC): $< ---> $@" $(OCAMLC) $(CAMLFLAGS) -c $(CWD)/$< |