summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Scherer <gabriel.scherer@gmail.com>2013-08-04 19:58:01 +0000
committerGabriel Scherer <gabriel.scherer@gmail.com>2013-08-04 19:58:01 +0000
commit8564a6e8c444a3d0b0b27f9b1f4e70d7041f1fe6 (patch)
tree7418f7c179f7326d05bf3200b439b2cb380232c9
parentbe793cb97eb71a080820190f253578e2c12fd454 (diff)
downloadocaml-8564a6e8c444a3d0b0b27f9b1f4e70d7041f1fe6.tar.gz
PR#5201: ocamlbuild: add --norc to the bash invocation to help Windows performances
This change was recommend by daweil on the bugtracker. According to the Bash documentation, the option -c that is already passed by ocamlbuild should already imply --norc, but daweil reported a 30% performance speedup with this change anyway. I'm a bit surprised, but this cannot hurt... git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13969 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--Changes1
-rw-r--r--ocamlbuild/my_std.ml2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changes b/Changes
index 771120afb4..68f628b60a 100644
--- a/Changes
+++ b/Changes
@@ -8,6 +8,7 @@ Compilers:
Bug fixes:
- PR#4719: Sys.executable_name wrong if executable name contains dots (Windows)
+- PR#5201: ocamlbuild: add --norc to the bash invocation to help performances
Standard library:
- PR#4986: add List.sort_uniq and Set.of_list
diff --git a/ocamlbuild/my_std.ml b/ocamlbuild/my_std.ml
index 8de751f747..e0d2c8a9ca 100644
--- a/ocamlbuild/my_std.ml
+++ b/ocamlbuild/my_std.ml
@@ -264,7 +264,7 @@ let sys_command =
match Sys.os_type with
| "Win32" -> fun cmd ->
if cmd = "" then 0 else
- let cmd = "bash -c "^Filename.quote cmd in
+ let cmd = "bash --norc -c "^Filename.quote cmd in
Sys.command cmd
| _ -> fun cmd -> if cmd = "" then 0 else Sys.command cmd