diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2024-07-12 16:49:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-12 16:49:03 +0200 |
| commit | ca40eeecff28c68cea7e195ec07fa0664ac3a36d (patch) | |
| tree | 37a3f95cf9900c63043ccf4d16749ae0dd54734d | |
| parent | 95933d51586b5407bd882264e550919ea5f97a53 (diff) | |
| parent | 40f2b1a1c2661a1eb7a040779f0bbfc882cde32b (diff) | |
Merge pull request #12926 from OatmealDome/macos-system-libs
BuildMacOSUniversalBinary: Disable usage of most system-provided libraries
| -rwxr-xr-x | BuildMacOSUniversalBinary.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/BuildMacOSUniversalBinary.py b/BuildMacOSUniversalBinary.py index 442fb83fe7..bcf5ce97d6 100755 --- a/BuildMacOSUniversalBinary.py +++ b/BuildMacOSUniversalBinary.py @@ -324,7 +324,15 @@ def build(config): + python_to_cmake_bool(config["steam"]), "-DENABLE_AUTOUPDATE=" + python_to_cmake_bool(config["autoupdate"]), - '-DDISTRIBUTOR=' + config['distributor'] + '-DDISTRIBUTOR=' + config['distributor'], + # Always use libraries from Externals to prevent any libraries + # installed by Homebrew from leaking in to the app + "-DUSE_SYSTEM_LIBS=OFF", + # However, we should still use the macOS provided versions of + # iconv, bzip2, and curl + "-DUSE_SYSTEM_ICONV=ON", + "-DUSE_SYSTEM_BZIP2=ON", + "-DUSE_SYSTEM_CURL=ON" ], env=env, cwd=arch) |
