Title: [105053] trunk/Tools
- Revision
- 105053
- Author
- [email protected]
- Date
- 2012-01-16 04:19:41 -0800 (Mon, 16 Jan 2012)
Log Message
[GTK] ldflags and cflags should take precedence over the existing flags in gtkdoc.py
https://bugs.webkit.org/show_bug.cgi?id=76369
Reviewed by Xan Lopez.
If there's an installed version of webkit and there are new
symbols in the build tree, gtkdoc-scanobj fails due to undefined
references, because the env ldflags are given before the local
ones.
* gtk/gtkdoc.py:
(GTKDoc._run_gtkdoc_scangobj):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (105052 => 105053)
--- trunk/Tools/ChangeLog 2012-01-16 12:05:03 UTC (rev 105052)
+++ trunk/Tools/ChangeLog 2012-01-16 12:19:41 UTC (rev 105053)
@@ -1,3 +1,18 @@
+2012-01-16 Carlos Garcia Campos <[email protected]>
+
+ [GTK] ldflags and cflags should take precedence over the existing flags in gtkdoc.py
+ https://bugs.webkit.org/show_bug.cgi?id=76369
+
+ Reviewed by Xan Lopez.
+
+ If there's an installed version of webkit and there are new
+ symbols in the build tree, gtkdoc-scanobj fails due to undefined
+ references, because the env ldflags are given before the local
+ ones.
+
+ * gtk/gtkdoc.py:
+ (GTKDoc._run_gtkdoc_scangobj):
+
2012-01-15 Pablo Flouret <[email protected]>
Fix compilation errors on build-webkit --debug --no-video on mac.
Modified: trunk/Tools/gtk/gtkdoc.py (105052 => 105053)
--- trunk/Tools/gtk/gtkdoc.py 2012-01-16 12:05:03 UTC (rev 105052)
+++ trunk/Tools/gtk/gtkdoc.py 2012-01-16 12:19:41 UTC (rev 105053)
@@ -290,9 +290,9 @@
env['RUN'] = 'LD_LIBRARY_PATH="%s" ' % self.library_path
if ldflags:
- env['LDFLAGS'] = '%s %s' % (env.get('LDFLAGS', ''), ldflags)
+ env['LDFLAGS'] = '%s %s' % (ldflags, env.get('LDFLAGS', ''))
if self.cflags:
- env['CFLAGS'] = '%s %s' % (env.get('CFLAGS', ''), self.cflags)
+ env['CFLAGS'] = '%s %s' % (self.cflags, env.get('CFLAGS', ''))
if 'CFLAGS' in env:
self.logger.debug('CFLAGS=%s', env['CFLAGS'])
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
