0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed InstallWithSuffix crash if some binaries are disabled.

Browse source 
Worked around scons bug that caused spurious success of C++ check.
This commit is contained in:
Sergey Popov 2008-05-01 08:51:30 +00:00
parent 1062758361
commit eea4f0737f
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SConstruct
View file

@ -185,7 +185,7 @@ def CheckCPlusPlus(context, gcc_version = None):
\n""" % version_num
message += "... "
context.Message(message)
if context.TryBuild(context.env.Program, test_program, ".cpp") == 1:
if context.TryBuild(context.env.Program, test_program, ".cpp") == 1 and context.lastTarget.get_contents() != "":
context.Result("yes")
return True
else:
@ -647,6 +647,8 @@ def InstallFilteredHook(target, source, env):
env.Append(BUILDERS={'InstallFiltered':Builder(action=InstallFilteredHook)})
def InstallWithSuffix(env, target, source):
if not source:
return source
return env.InstallAs(os.path.join(target, source[0].name + env["program_suffix"]), source)
#env.AddMethod(InstallWithSuffix)