Scons: command line arguments may be overwritten when building tools are loaded

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15237 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 060e1a0452149889683d3c7b10b0fe2db1e2f1c9..84dae97231d3aecaf5c508a95e590a7e68e36fac 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -529,6 +529,9 @@ def setEnvVariable(env, name, required = None, default = None, split = True):
     '''
     # 1. ARGUMENTS is already set to env[name], override default.
     if ARGUMENTS.has_key(name):
+        # env[name] may be rewritten when building tools are reloaded
+        # if that is the case, commandline option will override it.
+        env[name] = ARGUMENTS[name]
         default = None
     # then use environment default
     elif os.environ.has_key(name):