Changeset 117787 in webkit

Timestamp:

May 21, 2012, 9:06:42 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

webkitdirs.pm: Fix undefined CXXFLAGS variable
​https://bugs.webkit.org/show_bug.cgi?id=87000

Patch by Thiago Marcos P. Santos <​thiago.santos@intel.com> 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):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-21  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        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  <caio.oliveira@openbossa.org>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1870 +1870 @@
     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'} || "");
     }
 
@@ -2094 +2094 @@
     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'} || "");
     }