forked from ocaml-cross/opam-cross-windows
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add patch for correct replacement of OCAML_OS_TYPE in sys.mlp (ocaml-…
…windows64.4.08.0 only)
- Loading branch information
Showing
2 changed files
with
30 additions
and
0 deletions.
There are no files selected for viewing
27 changes: 27 additions & 0 deletions
27
...ws64/ocaml-windows64.4.08.0/files/patches/0001-Fix-OCAML_OS_TYPE-not-being-replaced.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
From bb9fa36e3f02e45499819b537f8438de83df377d Mon Sep 17 00:00:00 2001 | ||
From: Louis Gesbert <louis.gesbert@ocamlpro.com> | ||
Date: Wed, 18 Sep 2019 10:52:13 +0200 | ||
Subject: [PATCH] Fix OCAML_OS_TYPE not being replaced | ||
|
||
--- | ||
stdlib/Makefile | 4 +++- | ||
1 file changed, 3 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/stdlib/Makefile b/stdlib/Makefile | ||
index 67dc8bc47..34843f49c 100644 | ||
--- a/stdlib/Makefile | ||
+++ b/stdlib/Makefile | ||
@@ -234,7 +234,9 @@ stdlib.p.cmxa: $(OBJS:.cmo=.p.cmx) | ||
$(CAMLOPT) -a -o $@ $^ | ||
|
||
sys.ml: $(ROOTDIR)/VERSION sys.mlp | ||
- sed -e "s|%%VERSION%%|`sed -e 1q $< | tr -d '\r'`|" sys.mlp > $@ | ||
+ sed -e "s|%%VERSION%%|`sed -e 1q $< | tr -d '\r'`|" \ | ||
+ -e "s|%%OCAML_OS_TYPE%%|${OCAML_OS_TYPE}|g" \ | ||
+ sys.mlp > $@ | ||
|
||
.PHONY: clean | ||
clean:: | ||
-- | ||
2.11.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters