Title: [160170] trunk/Tools
- Revision
- 160170
- Author
- [email protected]
- Date
- 2013-12-05 04:38:15 -0800 (Thu, 05 Dec 2013)
Log Message
Fix cross compilation on x86
https://bugs.webkit.org/show_bug.cgi?id=125295
Patch by Laszlo Vidacs <[email protected]> on 2013-12-05
Reviewed by Zoltan Herczeg.
Certain compiler flags should not be added when cross compilation is enabled.
* Scripts/webkitdirs.pm:
(runAutogenForAutotoolsProjectIfNecessary):
(generateBuildSystemFromCMakeProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (160169 => 160170)
--- trunk/Tools/ChangeLog 2013-12-05 12:34:06 UTC (rev 160169)
+++ trunk/Tools/ChangeLog 2013-12-05 12:38:15 UTC (rev 160170)
@@ -1,3 +1,16 @@
+2013-12-05 Laszlo Vidacs <[email protected]>
+
+ Fix cross compilation on x86
+ https://bugs.webkit.org/show_bug.cgi?id=125295
+
+ Reviewed by Zoltan Herczeg.
+
+ Certain compiler flags should not be added when cross compilation is enabled.
+
+ * Scripts/webkitdirs.pm:
+ (runAutogenForAutotoolsProjectIfNecessary):
+ (generateBuildSystemFromCMakeProject):
+
2013-12-05 Tamas Gergely <[email protected]>
Remove duplicated/dead code from cpp style checker unit tests.
Modified: trunk/Tools/Scripts/webkitdirs.pm (160169 => 160170)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-12-05 12:34:06 UTC (rev 160169)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-12-05 12:38:15 UTC (rev 160170)
@@ -1802,7 +1802,7 @@
# between 32-bit and 64-bit architectures. The options are also
# used on Chromium build.
determineArchitecture();
- if ($architecture ne "x86_64" && !isARM()) {
+ if ($architecture ne "x86_64" && !isARM() && !isCrossCompilation()) {
$ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
}
@@ -2022,7 +2022,7 @@
# Compiler options to keep floating point values consistent
# between 32-bit and 64-bit architectures.
determineArchitecture();
- if ($architecture ne "x86_64" && !isARM()) {
+ if ($architecture ne "x86_64" && !isARM() && !isCrossCompilation()) {
$ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
