← Back to branch summary

~ubuntu-branches/ubuntu/natty/scons/natty

« back to all changes in this revision

Viewing changes to engine/SCons/Tool/linkloc.py

  • Committer: Bazaar Package Importer
  • Author(s): Michael Bienia
  • Date: 2007-12-08 20:01:12 UTC
  • mfrom: (0.2.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20071208200112-vqk3vh6hm31pqlxu
Tags: 0.97.0d20071203-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Don't use os.system()+env to spawn tools, working around underquoting of
    the environment until a real fix is done upstream.
  - debian/control: Modify Maintainer value to match
    DebianMaintainerField spec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
engine/SCons/Tool/linkloc.py
32
32
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
33
33
#
34
34
 
35
 
__revision__ = "/home/scons/scons/branch.0/baseline/src/engine/SCons/Tool/linkloc.py 0.97.D001 2007/05/17 11:35:19 knight"
 
35
__revision__ = "src/engine/SCons/Tool/linkloc.py 2509 2007/12/03 20:20:38 broonie"
36
36
 
37
37
import os.path
38
38
import re
96
96
 
97
97
    msvs_version = env.get('MSVS_VERSION')
98
98
    include_path, lib_path, exe_path = get_msvc_paths(env, version = msvs_version)
99
 
    env['ENV']['LIB']            = lib_path
100
 
    env['ENV']['PATH']           = exe_path
 
99
    env['ENV']['LIB'] = lib_path
 
100
    env.PrependENVPath('PATH', exe_path)
101
101
 
102
102
    addPharLapPaths(env)
103
103