summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-04-30 08:58:24 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-04-30 08:58:24 (GMT)
commitb226deb937bfcbac1bb5b8acca9404d2d371ae66 (patch)
tree60873712720d2161bc72804ead2068a4fa9d6201
parent09f61b624e99f69a9221ba46c15efa61892f475f (diff)
parentef641a262d27ef027de3e69733200044e13d02c5 (diff)
downloadswift-contrib-b226deb937bfcbac1bb5b8acca9404d2d371ae66.zip
swift-contrib-b226deb937bfcbac1bb5b8acca9404d2d371ae66.tar.bz2
Merge branch 'swift-1.x'
* swift-1.x: Avoid SCons adding .so suffix.
-rw-r--r--Swiften/SConscript1
1 files changed, 1 insertions, 0 deletions
diff --git a/Swiften/SConscript b/Swiften/SConscript
index e474ae3..c8508d3 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -221,6 +221,7 @@ if env["SCONS_STAGE"] == "build" :
env.MergeFlags(env["GCONF_FLAGS"])
if ARGUMENTS.get("swiften_dll", False) and myenv["PLATFORM"] == "posix" :
myenv.Append(LINKFLAGS = ["-Wl,-soname,$SWIFTEN_LIBRARY_NAME"])
+ myenv["SHLIBSUFFIX"] = ""
swiften_lib = myenv.SwiftenLibrary(swiften_env["SWIFTEN_LIBRARY_NAME"], sources + swiften_env["SWIFTEN_OBJECTS"])
def symlink(env, target, source) :
if os.path.exists(str(target[0])) :