summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-11 13:56:31 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-11 13:56:31 (GMT)
commit58cb340107caf29e2e2bc2a2aa12b82ef92bde9b (patch)
tree7403cf8b5a14fe8c7fa0b40161c1c80b4b4eca3c /BuildTools
parenta482abccbd8951d0adcfa61212a22b5942c050db (diff)
downloadswift-58cb340107caf29e2e2bc2a2aa12b82ef92bde9b.zip
swift-58cb340107caf29e2e2bc2a2aa12b82ef92bde9b.tar.bz2
Explicitly link against gobject.
This is required for newer linkers (gold) on Linux.
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConstruct2
1 files changed, 1 insertions, 1 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 6914880..2eefbc9 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -444,7 +444,7 @@ if env["PLATFORM"] != "win32" and env["PLATFORM"] != "darwin" :
conf = Configure(gconf_env, custom_tests = {"CheckPKG": CheckPKG})
if conf.CheckPKG("gconf-2.0") :
gconf_bare_env = Environment()
- gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 --libs gconf-2.0')
+ gconf_bare_env.ParseConfig('pkg-config --cflags gconf-2.0 gobject-2.0 --libs gconf-2.0 gobject-2.0')
gconf_flags = {
"LIBS": gconf_bare_env["LIBS"],
"CCFLAGS": gconf_bare_env["CCFLAGS"],