Changeset 160170 in webkit

Timestamp:

Dec 5, 2013, 4:38:15 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Fix cross compilation on x86
​https://bugs.webkit.org/show_bug.cgi?id=125295

Patch by Laszlo Vidacs <​lac@inf.u-szeged.hu> 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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-12-05  Laszlo Vidacs  <lac@inf.u-szeged.hu>
+
+        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  <tgergely.u-szeged@partner.samsung.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1803 +1803 @@
     # 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'} || "");
     }
@@ -2023 +2023 @@
     # 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'} || "");
     }