Fix getInstallDir and getSliceDir for macOS bin dist

zeroc-ice · Oct 31, 2024 · ad61f33 · ad61f33
1 parent 0e1f210
commit ad61f33
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/scripts/Util.py b/scripts/Util.py
@@ -204,7 +204,10 @@ def getSliceDir(self, mapping, current):
         if installDir.endswith(mapping.name):
             installDir = installDir[0 : len(installDir) - len(mapping.name) - 1]
         if platform.getInstallDir() and installDir == platform.getInstallDir():
-            return os.path.join(installDir, "share", "ice", "slice")
+            if sys.platform == "darwin":
+                return os.path.join(installDir, "opt", "ice", "share", "ice", "slice")
+            else:
+                return os.path.join(installDir, "share", "ice", "slice")
         else:
             return os.path.join(installDir, "slice")
 
@@ -378,7 +381,7 @@ def getLdPathEnvName(self):
         return "DYLD_LIBRARY_PATH"
 
     def getInstallDir(self):
-        return "/usr/local"
+        return "/opt/homebrew" if platform_machine() == "arm64" else "/usr/local"
 
 
 class Linux(Platform):