Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not install VERSION file. (#9895) 

The installed VERSION file could clash with a C++20 standard header.

Fixes: #9523
master
Bernhard Schommer 2020-10-02 15:41:34 +02:00 committed by GitHub
parent 530330f3cf
commit b727f422bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changes
View File

@ -423,6 +423,10 @@ Working version
- #9824, #9837: Honour the CFLAGS and CPPFLAGS variables.
(Sébastien Hinderer, review by David Allsopp)
- #9895, #9523: Avoid conflict with C++20 by not installing VERSION to the OCaml
Standard Library directory.
(Bernhard Schommer, review by David Allsopp)
### Bug fixes:
- #7538, #9669: Check for misplaced attributes on module aliases

3
Makefile
View File

@ -352,9 +352,6 @@ install:
$(MKDIR) "$(INSTALL_LIBDIR)"
$(MKDIR) "$(INSTALL_STUBLIBDIR)"
$(MKDIR) "$(INSTALL_COMPLIBDIR)"
$(INSTALL_DATA) \
VERSION \
"$(INSTALL_LIBDIR)"
$(MAKE) -C runtime install
$(INSTALL_PROG) ocaml$(EXE) "$(INSTALL_BINDIR)"
ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true"