Title: [243083] trunk/Tools
- Revision
- 243083
- Author
- [email protected]
- Date
- 2019-03-18 11:07:30 -0700 (Mon, 18 Mar 2019)
Log Message
[CMake] Prevent potential warning when determining $architecture
https://bugs.webkit.org/show_bug.cgi?id=195891
Patch by Xan Lopez <[email protected]> on 2019-03-18
Reviewed by Michael Catanzaro.
It's possible for generateBuildSystemForCMakeProject to be called
before determineArchitecture() is ever called. This will make the
first eq check with $architecture to be bogus (and print a
warning). Change that to an eq check with architecture(), which
implicitly calls determineArchitecture() if needed, and change all
the other similar cases in the method in the same way to prevent
future bugs like this one.
* Scripts/webkitdirs.pm:
(generateBuildSystemFromCMakeProject):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (243082 => 243083)
--- trunk/Tools/ChangeLog 2019-03-18 17:59:50 UTC (rev 243082)
+++ trunk/Tools/ChangeLog 2019-03-18 18:07:30 UTC (rev 243083)
@@ -1,3 +1,21 @@
+2019-03-18 Xan Lopez <[email protected]>
+
+ [CMake] Prevent potential warning when determining $architecture
+ https://bugs.webkit.org/show_bug.cgi?id=195891
+
+ Reviewed by Michael Catanzaro.
+
+ It's possible for generateBuildSystemForCMakeProject to be called
+ before determineArchitecture() is ever called. This will make the
+ first eq check with $architecture to be bogus (and print a
+ warning). Change that to an eq check with architecture(), which
+ implicitly calls determineArchitecture() if needed, and change all
+ the other similar cases in the method in the same way to prevent
+ future bugs like this one.
+
+ * Scripts/webkitdirs.pm:
+ (generateBuildSystemFromCMakeProject):
+
2019-03-18 Adrian Perez de Castro <[email protected]>
[WPE] Tarballs generated with “make dist” cannot build documentation
Modified: trunk/Tools/Scripts/webkitdirs.pm (243082 => 243083)
--- trunk/Tools/Scripts/webkitdirs.pm 2019-03-18 17:59:50 UTC (rev 243082)
+++ trunk/Tools/Scripts/webkitdirs.pm 2019-03-18 18:07:30 UTC (rev 243083)
@@ -2262,7 +2262,7 @@
# Some ports have production mode, but build-webkit should always use developer mode.
push @args, "-DDEVELOPER_MODE=ON" if isGtk() || isJSCOnly() || isWPE() || isWinCairo();
- if ($architecture eq "x86_64" && shouldBuild32Bit()) {
+ if (architecture() eq "x86_64" && shouldBuild32Bit()) {
# CMAKE_LIBRARY_ARCHITECTURE is needed to get the right .pc
# files in Debian-based systems, for the others
# CMAKE_PREFIX_PATH will get us /usr/lib, which should be the
@@ -2278,8 +2278,8 @@
# Compiler options to keep floating point values consistent
# between 32-bit and 64-bit architectures.
- determineArchitecture();
- if ($architecture eq "i686" && !isCrossCompilation() && !isAnyWindows()) {
+ if ((architecture() eq "i686" || (architecture() eq "x86_64" && shouldBuild32Bit())) && !isCrossCompilation() && !isAnyWindows()) {
+ $ENV{'CFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CFLAGS'} || "");
$ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
