chore: fix linux search paths

pact-foundation · Mar 14, 2021 · e1802ad · e1802ad
1 parent 092feb8
commit e1802ad
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ TEST?=./...
 
 .DEFAULT_GOAL := ci
 
-ci:: docker deps clean bin install test pact goveralls
+ci:: docker deps clean bin installv3 test pactv3 goveralls
 
 docker:
 	@echo "--- 🛠 Starting docker"
@@ -18,9 +18,6 @@ bin:
 	@echo "==> Results:"
 	ls -hl build/
 
-install:
-	pact-go -l DEBUG install
-
 clean:
 	rm -rf build output dist examples/v3/pacts
 
@@ -42,10 +39,7 @@ install:
   fi
 
 installv3:
-	@if [ ! -d ./libs/libpact_mock_server_ffi.dylib ]; then\
-		@echo "--- 🐿 Installing Rust lib"; \
-		make rust; \
-  fi
+	pact-go -l DEBUG install
 
 pact: install docker
 	@echo "--- 🔨 Running Pact examples"
@@ -86,9 +80,4 @@ testrace:
 updatedeps:
 	go get -d -v -p 2 ./...
 
-rust:
-	cd ~/development/public/pact-reference/rust; \
-	cargo build; \
-	cp ~/development/public/pact-reference/rust/target/debug/libpact_mock_server_ffi.dylib ./libs/libpact_mock_server_ffi.dylib
-
 .PHONY: install bin default dev test pact updatedeps clean release
diff --git a/v3/internal/native/mockserver/mock_server_lib.go b/v3/internal/native/mockserver/mock_server_lib.go
@@ -3,7 +3,7 @@ package mockserver
 /*
 #cgo darwin,amd64 LDFLAGS: -v -lpact_mock_server_ffi
 #cgo windows,amd64 LDFLAGS: -lpact_mock_server_ffi
-#cgo linux,amd64 LDFLAGS: -lpact_mock_server_ffi
+#cgo linux,amd64 LDFLAGS: -L/usr/local/lib -Wl,-rpath -Wl,/usr/local/lib -lpact_mock_server_ffi
 
 // Mac OSX (until https://github.com/pact-foundation/pact-reference/pull/93 is done)
 //  install_name_tool -id "libpact_mock_server_ffi" libpact_mock_server_ffi.dylib

diff --git a/v3/internal/native/verifier/verifier_lib.go b/v3/internal/native/verifier/verifier_lib.go
@@ -3,7 +3,7 @@ package verifier
 /*
 #cgo darwin,amd64 LDFLAGS: -v -lpact_verifier_ffi
 #cgo windows,amd64 LDFLAGS: -v -lpact_verifier_ffi
-#cgo linux,amd64 LDFLAGS: -v -lpact_verifier_ffi
+#cgo linux,amd64 LDFLAGS: -v -L/usr/local/lib -Wl,-rpath -Wl,/usr/local/lib -lpact_verifier_ffi
 
 // Mac OSX (until https://github.com/pact-foundation/pact-reference/pull/93 is done)
 // install_name_tool -id "libpact_verifier_ffi.dylib" /usr/local/lib/libpact_verifier_ffi.dylib