aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorletouzey2012-08-23 12:52:45 +0000
committerletouzey2012-08-23 12:52:45 +0000
commitb30c55b34f9814c2100d33740130c47a54dd16d0 (patch)
tree3f10a78733dc34c4835678e1041e746122a2c40c
parent650f9c37a3ac80f1e0121f01c67889e2c55838c8 (diff)
Revert "when cross-compiling with mingw32, let's fix the Filename.dir_sep"
This was merely cosmetic after all, since recent Windows versions do tolerate paths with /. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15750 85f007b7-540e-0410-9357-904b9bb8a0f7
-rw-r--r--myocamlbuild.ml9
-rw-r--r--tools/win32hack.mllib1
-rw-r--r--tools/win32hack_filename.ml4
3 files changed, 0 insertions, 14 deletions
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index 29514b9ebc..1b239ee914 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -402,15 +402,6 @@ let extra_rules () = begin
if w32 then flag ["link"; "ocaml"; "program"; "ide"]
(S [A "-ccopt"; A "-link -Wl,-subsystem,windows"; P w32ico]);
-(** The mingw32-ocaml cross-compiler currently uses Filename.dir_sep="/".
- Let's tweak that... *)
-
- if w32 then begin
- ocaml_lib "tools/win32hack";
- List.iter (fun (_,s,_) -> tag_file (s^".native") ["use_win32hack"])
- all_binaries
- end;
-
(** Coqtop *)
let () =
diff --git a/tools/win32hack.mllib b/tools/win32hack.mllib
deleted file mode 100644
index 42395f65c7..0000000000
--- a/tools/win32hack.mllib
+++ /dev/null
@@ -1 +0,0 @@
-Win32hack_filename \ No newline at end of file
diff --git a/tools/win32hack_filename.ml b/tools/win32hack_filename.ml
deleted file mode 100644
index 74f70686fe..0000000000
--- a/tools/win32hack_filename.ml
+++ /dev/null
@@ -1,4 +0,0 @@
-(* The mingw32-ocaml cross-compiler currently uses Filename.dir_sep="/".
- Let's tweak that... *)
-
-let _ = Filename.dir_sep.[0] <- '\\'