summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorGary E. Miller <gem@rellim.com>2019-04-01 18:30:04 -0700
committerGary E. Miller <gem@rellim.com>2019-04-02 15:22:06 -0700
commit9508f896f50d5cdf085ac82f347802f2ba930c29 (patch)
tree50695a4e7e70b5b4547dc1b1a7c7ed2c03f099db /SConstruct
parent41807d2312ddb9f989659e28feaa9e7a14ec2583 (diff)
downloadgpsd-9508f896f50d5cdf085ac82f347802f2ba930c29.tar.gz
SConstruct: Change osx_lib_tool to match new style.
scons 3.0.5 wants config.env, instead of env, or bare keyword, so that options get stored in the config.
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct10
1 files changed, 5 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct
index 1fffe57f..46e8c769 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1025,12 +1025,12 @@ else:
if sys.platform.startswith('darwin'):
try:
- osx_lib_tool = config.CheckProg('install_name_tool')
+ config.env["osx_lib_tool"] = config.CheckProg('install_name_tool')
except AttributeError:
# Just assume it's there if old SCons
- osx_lib_tool = 'install_name_tool'
+ config.env["osx_lib_tool"] = 'install_name_tool'
else:
- osx_lib_tool = None
+ config.env["osx_lib_tool"] = None
# Set up configuration for target Python
@@ -1260,8 +1260,8 @@ else:
def LibraryInstall(env, libdir, sources, version):
inst = env.InstallVersionedLib(libdir, sources, SHLIBVERSION=version)
- if osx_lib_tool:
- toolcmd = '%s -id $TARGET $TARGET' % osx_lib_tool
+ if env["osx_lib_tool"]:
+ toolcmd = '%s -id $TARGET $TARGET' % env["osx_lib_tool"]
env.AddPostAction(inst, toolcmd)
return inst