Skip to content

Commit 160f2f8

Browse files
author
dwightguth
authored
autodetect procps (#411)
* autodetect procps * fix typo * deps/plugin: update plugin submodule
1 parent 937f286 commit 160f2f8

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

Makefile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,18 @@ $(libsecp256k1_out): $(DEPS_DIR)/secp256k1/autogen.sh
8181
&& make -s -j4 \
8282
&& make install
8383

84+
UNAME_S := $(shell uname -s)
85+
86+
ifeq ($(UNAME_S),Linux)
87+
LIBFF_CMAKE_FLAGS=
88+
LINK_PROCPS=-lprocps
89+
else
90+
LIBFF_CMAKE_FLAGS=-DWITH_PROCPS=OFF
91+
LINK_PROCPS=
92+
endif
93+
8494
LIBFF_CC ?=clang-8
8595
LIBFF_CXX?=clang++-8
86-
LIBFF_CMAKE_FLAGS?=
8796

8897
$(DEPS_DIR)/libff/CMakeLists.txt:
8998
@echo "== submodule: $(DEPS_DIR)/libff"
@@ -288,7 +297,7 @@ $(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/interpreter: $(node_files) $(DEFN_DI
288297
-ccopt $(PLUGIN_SUBMODULE)/plugin-c/crypto.cpp -ccopt $(PLUGIN_SUBMODULE)/plugin-c/blockchain.cpp -ccopt $(PLUGIN_SUBMODULE)/plugin-c/world.cpp -ccopt $(CURDIR)/$(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/plugin/proto/msg.pb.cc \
289298
-ccopt -I$(CURDIR)/$(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/plugin \
290299
-ccopt -L$(LIBRARY_PATH) \
291-
-ccopt -lff -ccopt -lcryptopp -ccopt -lsecp256k1 -ccopt -lprocps -ccopt -lprotobuf -ccopt -g -ccopt -std=c++11 -ccopt -O2
300+
-ccopt -lff -ccopt -lcryptopp -ccopt -lsecp256k1 $(addprefix -ccopt ,$(LINK_PROCPS)) -ccopt -lprotobuf -ccopt -g -ccopt -std=c++11 -ccopt -O2
292301

293302
$(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/plugin/proto/msg.pb.cc: $(PLUGIN_SUBMODULE)/plugin/proto/msg.proto
294303
mkdir -p $(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/plugin
@@ -301,7 +310,7 @@ $(node_kompiled): $(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/interpreter $(libf
301310
-I $(PLUGIN_SUBMODULE)/plugin-c/ -I $(DEFN_DIR)/node/$(MAIN_DEFN_FILE)-kompiled/plugin -I $(PLUGIN_SUBMODULE)/vm-c/ -I $(PLUGIN_SUBMODULE)/vm-c/kevm/ -I node/ \
302311
$(LLVM_KOMPILE_OPTS) \
303312
-L$(LIBRARY_PATH) \
304-
-lff -lprotobuf -lgmp -lprocps -lcryptopp -lsecp256k1
313+
-lff -lprotobuf -lgmp $(LINK_PROCPS) -lcryptopp -lsecp256k1
305314

306315
# LLVM Backend
307316

@@ -315,7 +324,7 @@ $(llvm_kompiled): $(llvm_files) $(libff_out)
315324
-ccopt $(PLUGIN_SUBMODULE)/plugin-c/crypto.cpp \
316325
-ccopt -g -ccopt -std=c++11 -ccopt -O2 \
317326
-ccopt -L$(LIBRARY_PATH) \
318-
-ccopt -lff -ccopt -lcryptopp -ccopt -lsecp256k1 -ccopt -lprocps
327+
-ccopt -lff -ccopt -lcryptopp -ccopt -lsecp256k1 $(addprefix -ccopt ,$(LINK_PROCPS))
319328

320329
# Installing
321330
# ----------

0 commit comments

Comments
 (0)