From 84d7f3960515b4ad9cac952254c4496e458679b2 Mon Sep 17 00:00:00 2001
From: Josh Tynjala <joshtynjala@bowlerhat.dev>
Date: Mon, 8 Jul 2024 14:27:15 -0700
Subject: [PATCH] Revert "MacPlatform: use install_name_tool to add
 /usr/local/lib and /opt/hombrew/lib to rpath of lime.ndll"

This reverts commit 47936494ac22708db891504db685c54be42e9ec7.

Didn't work with Haxe/Neko installed from Apple Silicon Homebrew because Lime tools couldn't link to Neko.
---
 project/Build.xml              |  7 +++++++
 tools/platforms/MacPlatform.hx | 12 ------------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/project/Build.xml b/project/Build.xml
index 0310460d9a..a23c4033ac 100644
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -442,6 +442,13 @@
 			</section>
 
 			<section if="mac">
+				<!--
+					starting in xcode 15, rpath doesn't automatically include
+					/usr/local/lib, but we need it for neko
+				-->
+				<vflag name="-rpath" value="/usr/local/lib" />
+				<vflag name="-rpath" value="/opt/homebrew/lib" if="HXCPP_ARM64"/>
+
 				<vflag name="-l" value="iconv" />
 				<vflag name="-framework" value="IOKit" />
 				<vflag name="-framework" value="Foundation" />
diff --git a/tools/platforms/MacPlatform.hx b/tools/platforms/MacPlatform.hx
index 9889af858d..f2161d936a 100644
--- a/tools/platforms/MacPlatform.hx
+++ b/tools/platforms/MacPlatform.hx
@@ -2,7 +2,6 @@ package;
 
 import lime.tools.HashlinkHelper;
 import hxp.Haxelib;
-import hxp.HostArchitecture;
 import hxp.HXML;
 import hxp.Log;
 import hxp.Path;
@@ -189,17 +188,6 @@ class MacPlatform extends PlatformTarget
 
 			NekoHelper.createExecutable(project.templatePaths, "mac" + dirSuffix.toLowerCase(), targetDirectory + "/obj/ApplicationMain.n", executablePath);
 			NekoHelper.copyLibraries(project.templatePaths, "mac" + dirSuffix.toLowerCase(), executableDirectory);
-
-			// starting in xcode 15, rpath doesn't automatically include
-			// /usr/local/lib, but we need it for libneko dylib
-			System.runCommand("", "install_name_tool", ["-add_rpath", "/usr/local/lib", Path.join([executableDirectory, "lime.ndll"])]);
-			if (System.hostArchitecture == HostArchitecture.ARM64)
-			{
-				// on Apple Silicon, the user may have installed Neko with
-				// Homebrew, which has a different path. however, if the
-				// Homebrew path doesn't exist, that's okay.
-				System.runCommand("", "install_name_tool", ["-add_rpath", "/opt/homebrew/lib", Path.join([executableDirectory, "lime.ndll"])]);
-			}
 		}
 		else if (targetType == "hl")
 		{