From e5526544a32023122e3c686d866b9f70751cf1e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 10 Mar 2020 09:56:37 +0100 Subject: [PATCH] Revert "Change LINKFLAGS to FRAMEWORKS which is supported since Scons release 0.96.91" This reverts commit 2e152b945f542056815c107c8ced96222302548f. SCons `FRAMEWORKS` is, according to their latest docs, only supported "On Mac OS X with gcc". While the "with gcc" part seems bogus, #36795 did introduce a link failure for our osxcross toolchain for compiling macOS binaries from Linux. SCons probably fails to detect this as a macOS target and does not use its `FRAMEWORKS` logic properly. So using `LINKFLAGS` as we used to is the more portable solution. --- platform/osx/detect.py | 4 ++-- platform/server/detect.py | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 577788d3da..fe839199e8 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -149,8 +149,8 @@ def configure(env): env.Prepend(CPPPATH=['#platform/osx']) env.Append(CPPDEFINES=['OSX_ENABLED', 'UNIX_ENABLED', 'GLES_ENABLED', 'APPLE_STYLE_KEYS', 'COREAUDIO_ENABLED', 'COREMIDI_ENABLED']) - env.AppendUnique(FRAMEWORKS=['Cocoa', 'Carbon', 'OpenGL', 'AGL', 'AudioUnit', 'CoreAudio', 'CoreMIDI', 'IOKit', 'ForceFeedback', 'AVFoundation', 'CoreMedia', 'CoreVideo']) - env.Append(LIBS=['pthread', 'z']) + env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit', '-framework', 'CoreAudio', '-framework', 'CoreMIDI', '-lz', '-framework', 'IOKit', '-framework', 'ForceFeedback', '-framework', 'AVFoundation', '-framework', 'CoreMedia', '-framework', 'CoreVideo']) + env.Append(LIBS=['pthread']) env.Append(CCFLAGS=['-mmacosx-version-min=10.9']) env.Append(LINKFLAGS=['-mmacosx-version-min=10.9']) diff --git a/platform/server/detect.py b/platform/server/detect.py index 6734554b93..b195ecb186 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -228,8 +228,7 @@ def configure(env): env.Append(CPPDEFINES=['SERVER_ENABLED', 'UNIX_ENABLED']) if (platform.system() == "Darwin"): - env.AppendUnique(FRAMEWORKS=['Cocoa', 'Carbon', 'IOKit']) - env.Append(LIBS=['z']) + env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-lz', '-framework', 'IOKit']) env.Append(LIBS=['pthread'])