summaryrefslogtreecommitdiff
path: root/engine/SCons/Tool/clangxx.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-12 17:48:12 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-12 17:48:12 +0200
commit19712e5025e3cf6a33fccd0738f04e018d55025f (patch)
tree25683461da536e1e7ffee70279780b4f3586142f /engine/SCons/Tool/clangxx.py
parentcd2ab5002aa2359575088bbc3183a9a91cc50c31 (diff)
New upstream version 3.0.5upstream/3.0.5
Diffstat (limited to 'engine/SCons/Tool/clangxx.py')
-rw-r--r--engine/SCons/Tool/clangxx.py17
1 files changed, 14 insertions, 3 deletions
diff --git a/engine/SCons/Tool/clangxx.py b/engine/SCons/Tool/clangxx.py
index 63a9dec..6e4199e 100644
--- a/engine/SCons/Tool/clangxx.py
+++ b/engine/SCons/Tool/clangxx.py
@@ -11,7 +11,7 @@ selection method.
"""
#
-# Copyright (c) 2001 - 2017 The SCons Foundation
+# Copyright (c) 2001 - 2019 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -33,7 +33,7 @@ selection method.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-# __revision__ = "src/engine/SCons/Tool/clangxx.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog"
+# __revision__ = "src/engine/SCons/Tool/clangxx.py a56bbd8c09fb219ab8a9673330ffcd55279219d0 2019-03-26 23:16:31 bdeegan"
# Based on SCons/Tool/g++.py by Paweł Tomulik 2014 as a separate tool.
# Brought into the SCons mainline by Russel Winder 2017.
@@ -46,6 +46,8 @@ import sys
import SCons.Tool
import SCons.Util
import SCons.Tool.cxx
+from SCons.Tool.clangCommon import get_clang_install_dirs
+
compilers = ['clang++']
@@ -66,13 +68,22 @@ def generate(env):
env['SHOBJSUFFIX'] = '.pic.o'
elif env['PLATFORM'] == 'sunos':
env['SHOBJSUFFIX'] = '.pic.o'
+ elif env['PLATFORM'] == 'win32':
+ # Ensure that we have a proper path for clang++
+ clangxx = SCons.Tool.find_program_path(env, compilers[0], default_paths=get_clang_install_dirs(env['PLATFORM']))
+ if clangxx:
+ clangxx_bin_dir = os.path.dirname(clangxx)
+ env.AppendENVPath('PATH', clangxx_bin_dir)
+
# determine compiler version
if env['CXX']:
pipe = SCons.Action._subproc(env, [env['CXX'], '--version'],
stdin='devnull',
stderr='devnull',
stdout=subprocess.PIPE)
- if pipe.wait() != 0: return
+ if pipe.wait() != 0:
+ return
+
# clang -dumpversion is of no use
line = pipe.stdout.readline()
if sys.version_info[0] > 2: