Merge pull request #350 from stan-confluent/install-name-tool

fix: set install_name to absolute path for libpact_ffi.dylib (#345)
pact-foundation · Oct 3, 2023 · 4fde79c · 4fde79c
2 parents b9e9a47 + 5cef32c
commit 4fde79c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/installer/installer.go b/installer/installer.go
@@ -236,7 +236,7 @@ func (i *Installer) installDependencies() error {
 				return err
 			}
 
-			err = setOSXInstallName(dst, info.libName)
+			err = setOSXInstallName(dst)
 
 			if err != nil {
 				return err
@@ -289,8 +289,9 @@ func (i *Installer) updateConfiguration(dst string, pkg string, info packageInfo
 	return i.config.writeConfig(c)
 }
 
-var setOSXInstallName = func(file string, lib string) error {
-	cmd := exec.Command("install_name_tool", "-id", fmt.Sprintf("%s.dylib", lib), file)
+var setOSXInstallName = func(file string) error {
+	cmd := exec.Command("install_name_tool", "-id", file, file)
+	log.Println("[DEBUG] running command:", cmd)
 	stdoutStderr, err := cmd.CombinedOutput()
 
 	if err != nil {

diff --git a/installer/installer_test.go b/installer/installer_test.go
@@ -211,7 +211,7 @@ func (m *mockConfiguration) writeConfig(pactConfig) error {
 
 func restoreOSXInstallName() func() {
 	old := setOSXInstallName
-	setOSXInstallName = func(string, string) error {
+	setOSXInstallName = func(string) error {
 		return nil
 	}