Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / build / common.gypi

diff --git a/src/build/common.gypi b/src/build/common.gypi
index 11bc933..5c9d589 100644 (file)
--- a/src/build/common.gypi
+++ b/src/build/common.gypi
@@ -1237,6 +1237,10 @@
     # whether warnings are treated as errors.
     'chromium_code%': 0,
 
+    # Disable fatal linker warnings, similarly to how we make it possible
+    # to disable -Werror (e.g. for different toolchain versions).
+    'disable_fatal_linker_warnings%': 0,
+
     'release_valgrind_build%': 0,
 
     # TODO(thakis): Make this a blacklist instead, http://crbug.com/101600
@@ -3078,16 +3082,22 @@
     },
   },
   'conditions': [
-    # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
-    ['os_posix==1 and (chromeos==0 or target_arch!="arm")', {
+    ['os_posix==1', {
       'target_defaults': {
         'ldflags': [
-          '-Wl,--fatal-warnings',
           '-Wl,-z,now',
           '-Wl,-z,relro',
         ],
       },
     }],
+    # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
+    ['os_posix==1 and disable_fatal_linker_warnings==0 and (chromeos==0 or target_arch!="arm")', {
+      'target_defaults': {
+        'ldflags': [
+          '-Wl,--fatal-warnings',
+        ],
+      },
+    }],
     ['os_posix==1 and chromeos==0', {
       # Chrome OS enables -fstack-protector-strong via its build wrapper,
       # and we want to avoid overriding this, so stack-protector is only