balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Makefile: fix utop rules

Browse Source
This commit is contained in:
Grégoire Henry 2017-08-02 15:39:10 +02:00
parent 67bbf11a12
commit b8ccfeb0cf
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile
View File

@ -138,7 +138,7 @@ utils.top: DEVFLAGS=
utils.top: utils.top:
( $(patsubst %, echo "#require \"%\";;" ; ,${UTILS_PACKAGES}) ) > .ocamlinit.utils ( $(patsubst %, echo "#require \"%\";;" ; ,${UTILS_PACKAGES}) ) > .ocamlinit.utils
( $(patsubst %, echo "#mod_use \"%\";;" ; ,${MINUTILS_LIB_IMPLS} ${UTILS_LIB_IMPLS}) ) >> .ocamlinit.utils ( $(patsubst %, echo "#mod_use \"%\";;" ; ,${MINUTILS_LIB_IMPLS} ${UTILS_LIB_IMPLS}) ) >> .ocamlinit.utils
utop -init .ocamlinit.utils ${OCAMLFLAGS} utop -init .ocamlinit.utils ${UTOPFLAGS}
############################################################################ ############################################################################
## Node protocol compiler (also embedded in the main program) ## Node protocol compiler (also embedded in the main program)
@ -200,7 +200,7 @@ node.top: ${MINUTILS_LIB_IMPLS} ${UTILS_LIB_IMPLS} ${COMPILER_LIB_IMPLS} ${FULL_
( $(patsubst %, echo "#mod_use \"%\";;" ; ,${MINUTILS_LIB_IMPLS} ${UTILS_LIB_IMPLS}) ) >> .ocamlinit.node ( $(patsubst %, echo "#mod_use \"%\";;" ; ,${MINUTILS_LIB_IMPLS} ${UTILS_LIB_IMPLS}) ) >> .ocamlinit.node
( $(patsubst %, echo "open %;;" ; ,Error_monad Hash Utils) ) >> .ocamlinit.node ( $(patsubst %, echo "open %;;" ; ,Error_monad Hash Utils) ) >> .ocamlinit.node
( $(patsubst %, echo "#mod_use \"%\";;" ; ,${COMPILER_LIB_IMPLS} ${FULL_NODE_LIB_IMPLS}) ) >> .ocamlinit.node ( $(patsubst %, echo "#mod_use \"%\";;" ; ,${COMPILER_LIB_IMPLS} ${FULL_NODE_LIB_IMPLS}) ) >> .ocamlinit.node
utop -init .ocamlinit.node ${OCAMLFLAGS} utop -init .ocamlinit.node ${UTOPFLAGS}
clean:: clean::
rm -f ${TZNODE} rm -f ${TZNODE}

2
src/Makefile.config
View File

@ -17,6 +17,8 @@ OCAMLFLAGS = \
${INCLUDES} \ ${INCLUDES} \
${EXTRA_OCAMLFLAGS} ${EXTRA_OCAMLFLAGS}
UTOPFLAGS = $(filter-out -thread,${OCAMLFLAGS})
OCAMLC = ocamlfind ocamlc OCAMLC = ocamlfind ocamlc
OCAMLOPT = ocamlfind ocamlopt OCAMLOPT = ocamlfind ocamlopt
OCAMLMKTOP = ocamlfind ocamlmktop OCAMLMKTOP = ocamlfind ocamlmktop

1
src/Makefile.files
View File

@ -171,6 +171,7 @@ COMPILER_IMPLS := \
COMPILER_PACKAGES := \ COMPILER_PACKAGES := \
${UTILS_PACKAGES} \ ${UTILS_PACKAGES} \
compiler-libs \
compiler-libs.optcomp \ compiler-libs.optcomp \
lwt.unix \ lwt.unix \
ocplib-endian \ ocplib-endian \