Merge pull request #242 from provenance-io/mtps/rpath-to-release-branch

Cherry picked commit for rpath to release branch
provenance-io · Apr 9, 2021 · 78e8b0c · 78e8b0c
2 parents 9040a44 + 1b3c302
commit 78e8b0c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,6 +34,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## Unreleased
 
+### Bug Fixes
+
+* Add rpath fix for libwasmvm lib lookup.
+
 ## [v1.0.0](https://github.com/provenance-io/provenance/releases/tag/v1.0.0) - 2021-03-31
 
 ### Bug Fixes

diff --git a/Makefile b/Makefile
@@ -5,9 +5,9 @@ PACKAGES               := $(shell go list ./... 2>/dev/null || true)
 PACKAGES_NOSIMULATION  := $(filter-out %/simulation%,$(PACKAGES))
 PACKAGES_SIMULATION    := $(filter     %/simulation%,$(PACKAGES))
 
-LEVELDB_PATH := $(shell brew --prefix leveldb 2>/dev/null || echo "$(HOME)/Cellar/leveldb/1.22/include")
-CGO_CFLAGS := -I$(LEVELDB_PATH)/include
-CGO_LDFLAGS := -L$(LEVELDB_PATH)/lib
+LEVELDB_PATH = $(shell brew --prefix leveldb 2>/dev/null || echo "$(HOME)/Cellar/leveldb/1.22/include")
+CGO_CFLAGS   = -I$(LEVELDB_PATH)/include
+CGO_LDFLAGS  = "-L$(LEVELDB_PATH)/lib -Wl,-rpath,\$$ORIGIN"
 
 BINDIR ?= $(GOPATH)/bin
 BUILDDIR ?= $(CURDIR)/build