fix for ocamlbuild on cygwin cannot find ocamlfind#108
fix for ocamlbuild on cygwin cannot find ocamlfind#108algoriddle wants to merge 2 commits intoocaml:trunkfrom algoriddle:trunk
Conversation
ocamlbuild should append .exe extension to filename when looking for executables on os_type 'Cygwin' (same as os_type 'Win32')
ocamlbuild/command.ml
Outdated
There was a problem hiding this comment.
It is usualy a better idea to use Sys.win32 and Sys.cygwin
use Sys.win32 and Sys.cygwin
|
@chambart revised per your comment |
|
Before changing this, I would like to know if that is a regression caused by 2c6e6d6 . I don't have a Windows environment to test. Could you try to revert this commit locally (without this pull-request applied) and confirm that your use-case still fails? PS: see this discussion for some history of the exhausting work to support Cygwin without adequate resources and beta-testers. |
|
@gasche Reverted 2c6e6d6 and retested. It didn't make any difference to this issue, so this isn't a regression caused by 2c6e6d6. Command.string_of_command_spec returns "ocamlfind" (without the quotes), so the behavior of this code appears to be identical on Cygwin before or after 2c6e6d6. I understand the lack of testers being an issue. I will try to do my bit. |
|
Thanks for testing! It seems your patch is particularly safe because it only changes Cygwin behavior (which you report does not work at all; it worked in the past) and only enables more path to be searched (which should not degrade behavior). I'll probably merge that soon; hopefully we'll have some testing on various Windows ports before the next release. |
|
Merged upstream. Thanks, and sorry for the long delay... |
c703f5f Incorporate upstream comments into type-variable refactor (ocaml#121) 362ba23 Constrain curry modes to increase along applications (ocaml#108) b1f0cf9 Simplify the extension handling (ocaml#114) 4fd53a1 Remove pat_mode from typedtree (ocaml#105) cf6fcbc Handle attributes on lambdas with locally abstract types (ocaml#120) 5fa80fe Don't track attributes inside attributes for warning 53 (ocaml#115) 8a69777 Handle unclosed `[: ... :]` patterns (via `Generic_array` machinery) (ocaml#117) b0737f4 Add promote-one Makefile target (ocaml#118) c6ad684 Refactoring and fixes around module lookup (ocaml#107) b0a6495 Add documentation for global constructor arguments (ocaml#69) dd79aec Print `nlocal` in the `-d(raw)lambda` output (ocaml#112) 8035026 Fix `nlocal` in the generated Lambda for list comprehensions (ocaml#113) afbcdf0 Immutable arrays (ocaml#47) bfe1490 fix several issues when removing exp_mode (ocaml#110) 8f46060 Better error message for under-applied functions (ocaml#74) 27331d8 Consistently use Lmutvar or Lvar in comprehensions (ocaml#111) 01e965b Skip failing test for now 0131357 Fix test case to use comprehensions_experimental 22a7368 Temporarily disable list comprehensions tests due to locals bug e08377d Make `comprehensions` into `comprehensions_experimental` for now (ocaml#109) 947cf89 List and array comprehensions (ocaml#46) bd9e051 remove exp_mode from typedtree (ocaml#100) a9268d2 Fix misplaced attribute warning when using external parser (and some cleanup) (ocaml#101) 2b33f24 Refactor toplevel local escape check (ocaml#104) ed2aec6 Comment functions exported from TyVarEnv. 87838ba Move new variable creation into TyVarEnv. a3f60ab Encapsulate functions that work with tyvars 43d83a6 Prevent possibility of forgetting to re-widen 2f3dd34 Encapsulate context when narrowing type env't d78ff6d Make immediate64 things mode cross (ocaml#97) aa25ab9 Fix version number (ocaml#94) d01ffa0 Fix .depend file (ocaml#93) 942f2ab Bootstrap (ocaml#92) 05f7e38 Check Menhir version (ocaml#91) 1569b58 Move the CI jobs from 4.12 to 4.14. (ocaml#90) git-subtree-dir: ocaml git-subtree-split: c703f5f
add initial server-side code-highlighting
3 participants
ocamlbuild should append .exe extension to filename when looking for
executables on os_type 'Cygwin' (same as os_type 'Win32')