mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-21 07:31:26 +02:00
Code Issues Projects Releases Wiki Activity

Fix LINKFLAGS env variable being overwritten when compiling for OS X

Browse Source
This commit is contained in:
jacob1
2017-09-11 22:04:25 -04:00
committed by GitHub
parent 4f52d34a9d
commit e458d675bf
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SConscript
View File

@@ -210,7 +210,8 @@ def CheckBit(context):
def CheckFramework(context, framework): def CheckFramework(context, framework):
import SCons.Conftest import SCons.Conftest
#Extreme hack, TODO: maybe think of a better one (like replicating CheckLib here) or at least just fix the message #Extreme hack, TODO: maybe think of a better one (like replicating CheckLib here) or at least just fix the message
oldLinkFlags = context.env.Append(LINKFLAGS=["-framework", framework]) oldLinkFlags = env["LINKFLAGS"]
context.env.Append(LINKFLAGS=["-framework", framework])
context.Display("Checking for Darwin Framework {0}...".format(framework)) context.Display("Checking for Darwin Framework {0}...".format(framework))
ret = SCons.Conftest.CheckLib(context, ["m"], autoadd = 0) ret = SCons.Conftest.CheckLib(context, ["m"], autoadd = 0)
context.did_show_result = 1 context.did_show_result = 1