summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-01-01 21:54:51 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-01-02 00:01:42 +0000
commitb2e40643a328e4a60c04acf3e3079befb813c705 (patch)
tree550ab8f27c88539bd5081af1c170ce48253a9ed1
parent187066caa0d98836ecb1e2fd5e5c96bc83fcc82e (diff)
scons: Disable version symlinking for DLLs.
Fixes windows build.
-rw-r--r--scons/gallium.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/scons/gallium.py b/scons/gallium.py
index f24959c120..0133f9f046 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -56,13 +56,17 @@ def install_shared_library(env, source, version = ()):
source = str(source[0])
version = tuple(map(str, version))
target_dir = os.path.join(env.Dir('#.').srcnode().abspath, env['build'], 'lib')
- target_name = '.'.join((str(source),) + version)
- last = env.InstallAs(os.path.join(target_dir, target_name), source)
- while len(version):
- version = version[:-1]
+ if env['SHLIBSUFFIX'] == '.so':
target_name = '.'.join((str(source),) + version)
- action = SCons.Action.Action(symlink, "$TARGET -> $SOURCE")
- last = env.Command(os.path.join(target_dir, target_name), last, action)
+ last = env.InstallAs(os.path.join(target_dir, target_name), source)
+ while len(version):
+ version = version[:-1]
+ target_name = '.'.join((str(source),) + version)
+ action = SCons.Action.Action(symlink, "$TARGET -> $SOURCE")
+ last = env.Command(os.path.join(target_dir, target_name), last, action)
+ else:
+ target_name = str(source)
+ env.InstallAs(os.path.join(target_dir, target_name), source)
def createInstallMethods(env):
env.AddMethod(install_program, 'InstallProgram')