blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Abort make if scripts/install.sh fails

This commit is contained in:
Michael Vines 2018-12-11 15:20:40 -08:00
parent 17f1f40140
commit 54fb4e370c
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sdk/bpf/bpf.mk
View File

@ -1,5 +1,5 @@
LOCAL_PATH := $(dir $(lastword $(MAKEFILE_LIST))) LOCAL_PATH := $(dir $(lastword $(MAKEFILE_LIST)))
$(info $(shell $(LOCAL_PATH)/scripts/install.sh)) INSTALL_SH := $(abspath $(LOCAL_PATH)/scripts/install.sh)
all: all:
.PHONY: help all clean .PHONY: help all clean
@ -154,34 +154,38 @@ help:
@echo ' - make dump_foo' @echo ' - make dump_foo'
@echo '' @echo ''
.PHONY: $(INSTALL_SH)
$(INSTALL_SH):
$(INSTALL_SH)
.PRECIOUS: $(OUT_DIR)/%.ll .PRECIOUS: $(OUT_DIR)/%.ll
$(OUT_DIR)/%.ll: $(SRC_DIR)/%.c $(OUT_DIR)/%.ll: $(SRC_DIR)/%.c $(INSTALL_SH)
@echo "[cc] $@ ($<)" @echo "[cc] $@ ($<)"
$(_@)mkdir -p $(OUT_DIR) $(_@)mkdir -p $(OUT_DIR)
$(_@)$(CC) $(BPF_C_FLAGS) -o $@ -c $< -MD -MF $(@:.ll=.d) $(_@)$(CC) $(BPF_C_FLAGS) -o $@ -c $< -MD -MF $(@:.ll=.d)
$(OUT_DIR)/%.ll: $(SRC_DIR)/%.cc $(OUT_DIR)/%.ll: $(SRC_DIR)/%.cc $(INSTALL_SH)
@echo "[cxx] $@ ($<)" @echo "[cxx] $@ ($<)"
$(_@)mkdir -p $(OUT_DIR) $(_@)mkdir -p $(OUT_DIR)
$(_@)$(CXX) $(BPF_CXX_FLAGS) -o $@ -c $< -MD -MF $(@:.ll=.d) $(_@)$(CXX) $(BPF_CXX_FLAGS) -o $@ -c $< -MD -MF $(@:.ll=.d)
.PRECIOUS: $(OUT_DIR)/%.o .PRECIOUS: $(OUT_DIR)/%.o
$(OUT_DIR)/%.o: $(OUT_DIR)/%.ll $(OUT_DIR)/%.o: $(OUT_DIR)/%.ll $(INSTALL_SH)
@echo "[llc] $@ ($<)" @echo "[llc] $@ ($<)"
$(_@)$(LLC) $(BPF_LLC_FLAGS) -o $@ $< $(_@)$(LLC) $(BPF_LLC_FLAGS) -o $@ $<
.PRECIOUS: $(OUT_DIR)/%.so .PRECIOUS: $(OUT_DIR)/%.so
$(OUT_DIR)/%.so: $(OUT_DIR)/%.o $(OUT_DIR)/%.so: $(OUT_DIR)/%.o $(INSTALL_SH)
@echo "[lld] $@ ($<)" @echo "[lld] $@ ($<)"
$(_@)$(LLD) $(BPF_LLD_FLAGS) -o $@ $< $(_@)$(LLD) $(BPF_LLD_FLAGS) -o $@ $<
$(OUT_DIR)/test_%: $(TEST_DIR)/%.c $(OUT_DIR)/test_%: $(TEST_DIR)/%.c $(INSTALL_SH)
@echo "[test cc] $@ ($<)" @echo "[test cc] $@ ($<)"
$(_@)mkdir -p $(OUT_DIR) $(_@)mkdir -p $(OUT_DIR)
$(_@)$(CC) $(TEST_C_FLAGS) -o $@ $< -MD -MF $(@:=.d) $(_@)$(CC) $(TEST_C_FLAGS) -o $@ $< -MD -MF $(@:=.d)
$(_@)$(MACOS_ADJUST_TEST_DYLIB) $@ $(_@)$(MACOS_ADJUST_TEST_DYLIB) $@
$(OUT_DIR)/test_%: $(TEST_DIR)/%.cc $(OUT_DIR)/test_%: $(TEST_DIR)/%.cc $(INSTALL_SH)
@echo "[test cxx] $@ ($<)" @echo "[test cxx] $@ ($<)"
$(_@)mkdir -p $(OUT_DIR) $(_@)mkdir -p $(OUT_DIR)
$(_@)$(CXX) $(TEST_CXX_FLAGS) -o $@ $< -MD -MF $(@:=.d) $(_@)$(CXX) $(TEST_CXX_FLAGS) -o $@ $< -MD -MF $(@:=.d)

5
sdk/bpf/scripts/install.sh
View File

@ -47,10 +47,11 @@ if [[ ! -f llvm-native-$machine-$version.md ]]; then
echo "https://github.com/solana-labs/llvm-builder/releases/tag/$version" > ../llvm-native-$machine-$version.md echo "https://github.com/solana-labs/llvm-builder/releases/tag/$version" > ../llvm-native-$machine-$version.md
) )
# shellcheck disable=SC2181 exitcode=$?
if [[ $? -ne 0 ]]; then if [[ $exitcode -ne 0 ]]; then
rm -rf llvm-native rm -rf llvm-native
exit 1 exit 1
fi fi
fi fi
exit 0