@@ -37,6 +37,8 @@ LUA_PATH := $(PANDOC_TANGLE_SUBMODULE)/?.lua;;
37
37
export TANGLER
38
38
export LUA_PATH
39
39
40
+ OPAM ?= opam
41
+
40
42
.PHONY : all clean clean-submodules distclean install uninstall \
41
43
deps all-deps llvm-deps haskell-deps repo-deps k-deps ocaml-deps plugin-deps libsecp256k1 libff \
42
44
build build-all build-ocaml build-java build-node build-haskell build-llvm build-web3 \
@@ -140,8 +142,8 @@ $(PLUGIN_SUBMODULE)/make.timestamp:
140
142
touch $(PLUGIN_SUBMODULE ) /make.timestamp
141
143
142
144
ocaml-deps :
143
- eval $$(opam config env ) \
144
- opam install --yes mlgmp zarith uuidm cryptokit secp256k1.0.3.2 bn128 ocaml-protoc rlp yojson hex ocp-ocamlres
145
+ eval $$($( OPAM ) config env) \
146
+ $( OPAM ) install --yes mlgmp zarith uuidm cryptokit secp256k1.0.3.2 bn128 ocaml-protoc rlp yojson hex ocp-ocamlres
145
147
146
148
# Building
147
149
# --------
261
263
endif
262
264
263
265
$(ocaml_dir ) /$(MAIN_DEFN_FILE ) -kompiled/constants.$(EXT ) : $(ocaml_files )
264
- eval $$(opam config env ) \
266
+ eval $$($( OPAM ) config env) \
265
267
&& $(K_BIN ) /kompile --debug --main-module $(MAIN_MODULE ) --backend ocaml \
266
268
--syntax-module $(SYNTAX_MODULE ) $(ocaml_dir ) /$(MAIN_DEFN_FILE ) .k \
267
269
--hook-namespaces " KRYPTO" --gen-ml-only -O3 --non-strict \
@@ -272,7 +274,7 @@ $(ocaml_dir)/$(MAIN_DEFN_FILE)-kompiled/constants.$(EXT): $(ocaml_files)
272
274
$(ocaml_dir ) /$(MAIN_DEFN_FILE ) -kompiled/plugin/semantics.$(LIBEXT ) : $(wildcard $(PLUGIN_SUBMODULE ) /plugin/* .ml $(PLUGIN_SUBMODULE ) /plugin/* .mli) $(ocaml_dir ) /$(MAIN_DEFN_FILE ) -kompiled/constants.$(EXT )
273
275
@mkdir -p $(dir $@ )
274
276
cp $(PLUGIN_SUBMODULE ) /plugin/* .ml $(PLUGIN_SUBMODULE ) /plugin/* .mli $(dir $@ )
275
- eval $$(opam config env ) \
277
+ eval $$($( OPAM ) config env) \
276
278
&& ocp-ocamlres -format ocaml $(PLUGIN_SUBMODULE ) /plugin/proto/VERSION -o $(dir $@ ) /apiVersion.ml \
277
279
&& ocaml-protoc $(PLUGIN_SUBMODULE ) /plugin/proto/* .proto -ml_out $(dir $@ ) \
278
280
&& cd $(dir $@ ) \
@@ -284,7 +286,7 @@ $(ocaml_dir)/$(MAIN_DEFN_FILE)-kompiled/plugin/semantics.$(LIBEXT): $(wildcard $
284
286
&& ocamlfind install ethereum-semantics-plugin-ocaml $(PLUGIN_SUBMODULE ) /plugin/META semantics.* * .cmi * .$(EXT )
285
287
286
288
$(ocaml_kompiled ) : $(ocaml_dir ) /$(MAIN_DEFN_FILE ) -kompiled/plugin/semantics.$(LIBEXT )
287
- eval $$(opam config env ) \
289
+ eval $$($( OPAM ) config env) \
288
290
&& cd $(ocaml_dir ) /$(MAIN_DEFN_FILE ) -kompiled \
289
291
&& ocamllex lexer.mll \
290
292
&& ocamlyacc parser.mly \
0 commit comments