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

Fix installation of bytecode flexlink.exe 

The bytecode version of flexlink.exe is compiled before camlheader is
available, so it needs to have that prepended when it's installed.
master
David Allsopp 2017-03-09 13:58:40 +00:00
parent 7ef4018bd7
commit 80e7529be5
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -585,13 +585,10 @@ flexlink.opt:
.PHONY: install-flexdll
install-flexdll:
# The $(if ...) installs the correct .manifest file for MSVC and MSVC64
# (GNU make doesn't have ifeq as a function, hence slightly convoluted use of
# filter-out)
cp flexdll/flexlink$(EXE) \
$(if $(filter-out mingw,$(TOOLCHAIN)),\
flexdll/default$(filter-out _i386,_$(ARCH)).manifest) \
"$(INSTALL_BINDIR)"
cat stdlib/camlheader flexdll/flexlink.exe > "$(INSTALL_BINDIR)/flexlink.exe"
ifneq "$(filter-out mingw,$(TOOLCHAIN))" ""
cp flexdll/default$(filter-out _i386,_$(ARCH)).manifest "$(INSTALL_BINDIR)/"
endif
if test -n "$(wildcard flexdll/flexdll_*.$(O))" ; then \
$(MKDIR) "$(INSTALL_FLEXDLL)" ; \
cp flexdll/flexdll_*.$(O) "$(INSTALL_FLEXDLL)" ; \