summaryrefslogtreecommitdiff
path: root/.gitattributes
diff options
context:
space:
mode:
authorDavid Allsopp <david.allsopp@metastack.com>2021-01-04 17:28:27 +0000
committerDavid Allsopp <david.allsopp@metastack.com>2021-05-11 13:54:02 +0100
commit474255bb0e1265067bdd81bbf107f0027295be04 (patch)
tree6463eb35572d48567fc5b4a175b5e9a01138a93f /.gitattributes
parentc555a5bd6e72b0d4c15a74b6f1b93ac445ed22bd (diff)
downloadocaml-474255bb0e1265067bdd81bbf107f0027295be04.tar.gz
Control the flexdll bootstrap with configure
On Windows and Cygwin, if the submodule is initialised, configure will pick it up (this can be disabled by passing --without-flexdll to configure). --with-flexdll can also be used to specify a different location for the FlexDLL sources (e.g. when building using opam) and sources specified this way are first copied to flexdll-sources/
Diffstat (limited to '.gitattributes')
-rw-r--r--.gitattributes1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 1b193afe2b..699b865923 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -151,6 +151,7 @@ menhir-bench.bash typo.missing-header typo.utf8
/tools/ci/appveyor/appveyor_build.cmd text eol=crlf
+aclocal.m4 typo.tab
configure.ac text eol=lf
build-aux/compile text eol=lf
build-aux/config.guess text eol=lf