diff options
author | David Allsopp <david.allsopp@metastack.com> | 2022-05-09 14:41:48 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-09 14:41:48 +0100 |
commit | f7eb3b54a7f4426cdc4ed72dc5924be2fe781de7 (patch) | |
tree | 001b0eb029719443226f8912f13531d47f23eeaf /configure | |
parent | 27454be9a119b400450c14f5c5b6a9c8270b2940 (diff) | |
parent | f652c02139bc471f6f317035709ee6285dad1b58 (diff) | |
download | ocaml-f7eb3b54a7f4426cdc4ed72dc5924be2fe781de7.tar.gz |
Merge pull request #11243 from shindere/merge-yacc-makefile
Merge yacc/Makefile into the root Makefile
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -817,6 +817,7 @@ fpic syslib outputobj outputexe +ocamlyacc_wstr_module unix_or_win32 systhread_support system @@ -2917,6 +2918,7 @@ OCAML_VERSION_SHORT=5.0 + # TODO: rename this variable @@ -12651,9 +12653,11 @@ esac case $host in #( *-*-mingw32|*-pc-windows) : - unix_or_win32="win32" ;; #( + unix_or_win32="win32" + ocamlyacc_wstr_module="yacc/wstr" ;; #( *) : - unix_or_win32="unix" ;; + unix_or_win32="unix" + ocamlyacc_wstr_module="" ;; esac case $host in #( *-*-cygwin*|*-*-mingw32|*-pc-windows) : |