From: Bo Peng <bpeng@lyx.org>
Date: Wed, 4 Oct 2006 15:12:15 +0000 (+0000)
Subject: Scons: command line arguments may be overwritten when building tools are loaded
X-Git-Tag: 1.6.10~12457
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ba81af5fb2fd635c5d6960ba5ff214626674f9f7;p=features.git

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 060e1a0452..84dae97231 100644
--- 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):