summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorGary E. Miller <gem@rellim.com>2019-03-28 19:53:01 -0700
committerGary E. Miller <gem@rellim.com>2019-03-28 19:53:01 -0700
commitf7b2a108a2e4683d18d16a99173251f2444d332e (patch)
treeafcee5f4bda177274842ee25f56a8839d5d3cd0c /SConstruct
parentd73e5a81ef88b3fbd76586dfacdab2ac2693f8cf (diff)
downloadgpsd-f7b2a108a2e4683d18d16a99173251f2444d332e.tar.gz
SConstruct. Move an env.Prepend() to wortk on scons 3.0.5
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct7
1 files changed, 3 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct
index 0af984ed..38b6f29f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -658,6 +658,9 @@ def GetLoadPath(context):
cleaning = env.GetOption('clean')
helping = env.GetOption('help')
+# Always set up LIBPATH so that cleaning works properly.
+env.Prepend(LIBPATH=[os.path.realpath(os.curdir)])
+
# from scons 3.0.5, any changes to env after this, until after
# config.Finish(), will be lost.
config = Configure(env, custom_tests={
@@ -669,10 +672,6 @@ config = Configure(env, custom_tests={
'CheckHeaderDefines': CheckHeaderDefines,
'GetPythonValue': GetPythonValue})
-# this gets lost on scons 3.0.5
-# Always set up LIBPATH so that cleaning works properly.
-env.Prepend(LIBPATH=[os.path.realpath(os.curdir)])
-
if cleaning or helping:
dbusflags = []
rtlibs = []