Skip to content

Commit

Permalink
add some makefile fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
sskeirik committed Dec 11, 2024
1 parent d6b010a commit 08dd495
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ ULM_HOOKS_SRC=ulm_kllvm.cpp ulm_hooks.cpp ulm_kllvm_c.cpp
ULM_HOOKS_LIB=libulmkllvm.so
ULM_HOOKS_TARGET=$(ULM_LIB_DIR)/$(ULM_HOOKS_LIB)

ULM_SRC=$(wildcard $(ULM_CLONE_DIR)/**/*.cpp) $(wildcard $(ULM_CLONE_DIR)/**/*.h) $(wildcard $(ULM_CLONE_DIR)/**/*.go)

ULM_GETH_TARGET=$(ULM_BUILD_DIR)/geth

### ULM Crypto Plugin
Expand All @@ -79,7 +81,7 @@ $(ULM_KRYPTO_DIR)/.git:

$(ULM_KRYPTO_TARGET): | $(ULM_KRYPTO_DIR)/.git
@mkdir -p $(ULM_LIB_DIR)
$(if $(ULM_CXX), CXX=$(ULM_CXX)) make -C "$(ULM_KRYPTO_DIR)" build
$(if $(ULM_CXX), CXX=$(ULM_CXX)) $(MAKE) -C "$(ULM_KRYPTO_DIR)" build
cp "$(ULM_KRYPTO_DIR)/build/krypto/lib/krypto.a" "$(ULM_LIB_DIR)"

.PHONY: ulm-krypto-build
Expand All @@ -92,7 +94,7 @@ $(ULM_CLONE_DIR)/.git:
cd $(ULM_DEP_DIR); \
git clone --depth 1 https://github.com/pi-squared-inc/ulm

$(ULM_HOOKS_TARGET): | $(ULM_CLONE_DIR)/.git
$(ULM_HOOKS_TARGET): $(ULM_SRC) | $(ULM_CLONE_DIR)/.git
@mkdir -p $(ULM_LIB_DIR)
cd $(ULM_HOOKS_DIR); \
$(CXX) -shared -o "$(ULM_HOOKS_LIB)" $(ULM_HOOKS_SRC) -I "$(ULM_KF_INCLUDE_DIR)" -I "$(ULM_KF_INCLUDE_DIR)/kllvm" \
Expand Down Expand Up @@ -149,8 +151,8 @@ kevm-build: $(ULM_KEVM_TARGET)

### ULM

$(ULM_GETH_TARGET): $(ULM_KEVM_TARGET) | $(ULM_CLONE_DIR)
cd $(ULM_CLONE_DIR)/op-geth && make
$(ULM_GETH_TARGET): $(ULM_KEVM_TARGET) $(ULM_SRC) | $(ULM_CLONE_DIR)/.git
cd $(ULM_CLONE_DIR)/op-geth && $(MAKE)
cp $(ULM_CLONE_DIR)/op-geth/build/bin/geth $(ULM_BUILD_DIR)

.PHONY: ulm-build
Expand Down

0 comments on commit 08dd495

Please sign in to comment.