From f7b2a108a2e4683d18d16a99173251f2444d332e Mon Sep 17 00:00:00 2001 From: "Gary E. Miller" Date: Thu, 28 Mar 2019 19:53:01 -0700 Subject: SConstruct. Move an env.Prepend() to wortk on scons 3.0.5 --- SConstruct | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'SConstruct') 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 = [] -- cgit v1.2.1