Title: [117787] trunk/Tools
- Revision
- 117787
- Author
- [email protected]
- Date
- 2012-05-21 09:06:42 -0700 (Mon, 21 May 2012)
Log Message
webkitdirs.pm: Fix undefined CXXFLAGS variable
https://bugs.webkit.org/show_bug.cgi?id=87000
Patch by Thiago Marcos P. Santos <[email protected]> on 2012-05-21
Reviewed by Martin Robinson.
Fixes a warning on Autotools and CMake buildsystem when
CXXFLAGS is not defined.
* Scripts/webkitdirs.pm:
(runAutogenForAutotoolsProjectIfNecessary):
(generateBuildSystemFromCMakeProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (117786 => 117787)
--- trunk/Tools/ChangeLog 2012-05-21 16:02:07 UTC (rev 117786)
+++ trunk/Tools/ChangeLog 2012-05-21 16:06:42 UTC (rev 117787)
@@ -1,3 +1,17 @@
+2012-05-21 Thiago Marcos P. Santos <[email protected]>
+
+ webkitdirs.pm: Fix undefined CXXFLAGS variable
+ https://bugs.webkit.org/show_bug.cgi?id=87000
+
+ Reviewed by Martin Robinson.
+
+ Fixes a warning on Autotools and CMake buildsystem when
+ CXXFLAGS is not defined.
+
+ * Scripts/webkitdirs.pm:
+ (runAutogenForAutotoolsProjectIfNecessary):
+ (generateBuildSystemFromCMakeProject):
+
2012-05-21 Caio Marcelo de Oliveira Filho <[email protected]>
Move setEditingBehavior() from layoutTestController to window.internals
Modified: trunk/Tools/Scripts/webkitdirs.pm (117786 => 117787)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-05-21 16:02:07 UTC (rev 117786)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-05-21 16:06:42 UTC (rev 117787)
@@ -1869,7 +1869,7 @@
# used on Chromium build.
determineArchitecture();
if ($architecture ne "x86_64" && !isARM()) {
- $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . $ENV{'CXXFLAGS'};
+ $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
}
# Prefix the command with jhbuild run.
@@ -2093,7 +2093,7 @@
# between 32-bit and 64-bit architectures.
determineArchitecture();
if ($architecture ne "x86_64" && !isARM()) {
- $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . $ENV{'CXXFLAGS'};
+ $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
}
# We call system("cmake @args") instead of system("cmake", @args) so that @args is
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
