646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
18 lines
574 B
Diff
18 lines
574 B
Diff
diff -rupN piqi-0.6.12.orig/make/Makefile.ocaml piqi-0.6.12/make/Makefile.ocaml
|
|
--- piqi-0.6.12.orig/make/Makefile.ocaml 2015-03-13 13:35:19.000000000 +0100
|
|
+++ piqi-0.6.12/make/Makefile.ocaml 2015-06-10 21:19:57.231000000 +0200
|
|
@@ -1,13 +1,5 @@
|
|
OCAMLMAKEFILE := $(PIQI_ROOT)/make/OCamlMakefile
|
|
|
|
-
|
|
-OCAMLPATH := $(PIQI_BUILD)/lib/ocaml
|
|
-ifeq ($(SYSTEM),$(filter $(SYSTEM),mingw mingw64))
|
|
-OCAMLPATH := $(shell cygpath -w $(OCAMLPATH))
|
|
-endif
|
|
-export OCAMLPATH
|
|
-
|
|
-
|
|
# make sure camlp4o produces pretty-printed text instead of AST
|
|
export CAMLP4_O = $(CAMLP4)o -printer o
|
|
|