Changeset 156462 in webkit

Timestamp:

Sep 26, 2013 9:36:22 AM (11 years ago)

Author:

kov@webkit.org

Message:

[GTK] Tons of warnings caused by using FORTIFY_SOURCE in an unoptimized build
​https://bugs.webkit.org/show_bug.cgi?id=121836

Patch by Gustavo Noronha Silva <​gustavo.noronha@collabora.com> on 2013-09-26
Reviewed by Martin Robinson.

• Source/autotools/SetupCompilerFlags.m4: only consider enabling FORTIFY_SOURCE if optimizations have

been enabled, since they are required for FORTIFY_SOURCE to work, and enabling FORTIFY_SOURCE unconditionally
generates warnings in newer glibc.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/autotools/SetupCompilerFlags.m4 (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2013-09-26  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
+
+        [GTK] Tons of warnings caused by using FORTIFY_SOURCE in an unoptimized build
+        https://bugs.webkit.org/show_bug.cgi?id=121836
+
+        Reviewed by Martin Robinson.
+
+        * Source/autotools/SetupCompilerFlags.m4: only consider enabling FORTIFY_SOURCE if optimizations have
+        been enabled, since they are required for FORTIFY_SOURCE to work, and enabling FORTIFY_SOURCE unconditionally
+        generates warnings in newer glibc.
+
 2013-09-25  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/Source/autotools/SetupCompilerFlags.m4

@@ -14 +14 @@
 if test "$cxx_compiler" = "clang++"; then
     CXXFLAGS="$CXXFLAGS -stdlib=libstdc++ -Wno-c++11-extensions -Qunused-arguments"
-fi
-
-if test "$c_compiler" = "gcc"; then
-    CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
-fi
-if test "$cxx_compiler" = "g++"; then
-    CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
 fi
 
@@ -41 +34 @@
     CXXFLAGS="$CXXFLAGS -O2"
     CFLAGS="$CFLAGS -O2"
+
+    if test "$c_compiler" = "gcc"; then
+        CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
+    fi
+    if test "$cxx_compiler" = "g++"; then
+        CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
+    fi
 else
     CXXFLAGS="$CXXFLAGS -O0"