diff options
| author | Kent Mein <mein@cs.umn.edu> | 2007-12-07 00:41:22 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2007-12-07 00:41:22 +0300 |
| commit | 90715580b93d633aa01e1c0e12b057301658cc59 (patch) | |
| tree | 367377bc4162746e55a475c8fb386c2d615bec53 /tools | |
| parent | 3bbf0736b26e80201dced29dc55f18438fb46e69 (diff) | |
This is patch: [#7129] Solaris build is linking with c instead of c++ compiler
I talked to Jesterking and he may switch this to a more global
solution later. I figured in the meantime its ok to commit this
and consider the issue resolved.
Kent
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index 58f5ea7b661..77262d6eaaf 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -430,6 +430,8 @@ class BlenderEnvironment(SConsEnvironment): if lenv['OURPLATFORM']=='sunos5': lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS']) lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS']) + if lenv['CXX'].endswith('CC'): + lenv.Replace(LINK = '$CXX') if lenv['OURPLATFORM']=='darwin': lenv.Append(LINKFLAGS = lenv['PLATFORM_LINKFLAGS']) lenv.Append(LINKFLAGS = lenv['BF_PYTHON_LINKFLAGS']) |