emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix SCons bugs

Browse source 
Don't clober the Environment (and thus the ENV['PATH'] by redefining it
and don't link against lr by default. Only add it if uname is not Darwin
This commit is contained in:
Joe Rozner 2013-11-08 16:30:08 -08:00
parent 035e0c0ba2
commit fb015b4a98
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -3,13 +3,12 @@ import os
import os.path import os.path
import sys import sys
env = Environment(ENV = {'PATH' : os.environ['PATH']})
vars = Variables(None, ARGUMENTS) vars = Variables(None, ARGUMENTS)
vars.Add(PathVariable('DESTDIR', "Root directory to install in (useful for packaging scripts)", None, PathVariable.PathIsDirCreate)) vars.Add(PathVariable('DESTDIR', "Root directory to install in (useful for packaging scripts)", None, PathVariable.PathIsDirCreate))
vars.Add(PathVariable('prefix', "Where to install in the FHS", "/usr/local", PathVariable.PathAccept)) vars.Add(PathVariable('prefix', "Where to install in the FHS", "/usr/local", PathVariable.PathAccept))
env = Environment(variables=vars) env = Environment(ENV = os.environ, variables = vars)
def calcInstallPath(*elements): def calcInstallPath(*elements):
path = os.path.abspath(os.path.join(*map(env.subst, elements))) path = os.path.abspath(os.path.join(*map(env.subst, elements)))
@ -31,7 +30,7 @@ env['libpath'] = calcInstallPath("$prefix", "lib")
env['incpath'] = calcInstallPath("$prefix", "include", "hammer") env['incpath'] = calcInstallPath("$prefix", "include", "hammer")
# TODO: Add pkgconfig # TODO: Add pkgconfig
env.MergeFlags("-std=gnu99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-attributes -lrt") env.MergeFlags("-std=gnu99 -Wall -Wextra -Werror -Wno-unused-parameter -Wno-attributes")
if not env['PLATFORM'] == 'darwin': if not env['PLATFORM'] == 'darwin':
env.MergeFlags("-lrt") env.MergeFlags("-lrt")