From 94babc4096eb7ff804f5087fb9600ee110b9591d Mon Sep 17 00:00:00 2001 From: Pavel Strakhov Date: Thu, 25 Jul 2024 11:20:05 +0100 Subject: [PATCH] fix: build library without solana sdk (#414) --- Cargo.lock | 2 +- program/c/makefile | 14 ++++++++------ program/rust/Cargo.toml | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3690382b..a312b6f1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2533,7 +2533,7 @@ dependencies = [ [[package]] name = "pyth-oracle" -version = "2.32.0" +version = "2.32.1" dependencies = [ "bincode", "bindgen", diff --git a/program/c/makefile b/program/c/makefile index 3b791858..4df14edd 100644 --- a/program/c/makefile +++ b/program/c/makefile @@ -3,12 +3,14 @@ OUT_DIR := $(if $(OUT_DIR),$(OUT_DIR),./target) SOLANA := $(shell dirname $(shell which cargo-build-bpf)) -ifneq ("$(wildcard $(SOLANA)/sdk/bpf/c/bpf.mk)","") - $(info using Solana BPF SDK) - include $(SOLANA)/sdk/bpf/c/bpf.mk -else - $(info using Solana SBF SDK) - include $(SOLANA)/sdk/sbf/c/sbf.mk +ifneq ("$(SOLANA)","") + ifneq ("$(wildcard $(SOLANA)/sdk/bpf/c/bpf.mk)","") + $(info using Solana BPF SDK) + include $(SOLANA)/sdk/bpf/c/bpf.mk + else + $(info using Solana SBF SDK) + include $(SOLANA)/sdk/sbf/c/sbf.mk + endif endif FEATURES_H_BODY:="\#pragma once" diff --git a/program/rust/Cargo.toml b/program/rust/Cargo.toml index bbb1eb35..a51ab169 100644 --- a/program/rust/Cargo.toml +++ b/program/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pyth-oracle" -version = "2.32.0" +version = "2.32.1" edition = "2021" license = "Apache 2.0" publish = false