squash!: conditionaly add -Wno-cast-function-type

danbev · danbev · commit b81432dd402f · 2019-01-28T08:51:51.000+01:00
diff --git a/test/addons/async-hello-world/binding.gyp b/test/addons/async-hello-world/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/async-hooks-id/binding.gyp b/test/addons/async-hooks-id/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/async-hooks-promise/binding.gyp b/test/addons/async-hooks-promise/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/async-resource/binding.gyp b/test/addons/async-resource/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/at-exit/binding.gyp b/test/addons/at-exit/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/buffer-free-callback/binding.gyp b/test/addons/buffer-free-callback/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/callback-scope/binding.gyp b/test/addons/callback-scope/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/dlopen-ping-pong/binding.gyp b/test/addons/dlopen-ping-pong/binding.gyp
@@ -19,7 +19,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/errno-exception/binding.gyp b/test/addons/errno-exception/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/heap-profiler/binding.gyp b/test/addons/heap-profiler/binding.gyp
@@ -5,7 +5,11 @@
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
       'win_delay_load_hook': 'false',
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/hello-world-esm/binding.gyp b/test/addons/hello-world-esm/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/hello-world-function-export/binding.gyp b/test/addons/hello-world-function-export/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/hello-world/binding.gyp b/test/addons/hello-world/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/load-long-path/binding.gyp b/test/addons/load-long-path/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/make-callback-domain-warning/binding.gyp b/test/addons/make-callback-domain-warning/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/make-callback-recurse/binding.gyp b/test/addons/make-callback-recurse/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/make-callback/binding.gyp b/test/addons/make-callback/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/new-target/binding.gyp b/test/addons/new-target/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/node-module-version/binding.gyp b/test/addons/node-module-version/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/non-node-context/binding.gyp b/test/addons/non-node-context/binding.gyp
@@ -3,7 +3,11 @@
     {
       'target_name': 'binding',
       'sources': ['binding.cc'],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     },
   ]
 }
diff --git a/test/addons/not-a-binding/binding.gyp b/test/addons/not-a-binding/binding.gyp
@@ -3,7 +3,11 @@
     {
       'target_name': 'binding',
       'sources': [ 'not_a_binding.c' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/null-buffer-neuter/binding.gyp b/test/addons/null-buffer-neuter/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/openssl-binding/binding.gyp b/test/addons/openssl-binding/binding.gyp
@@ -6,9 +6,11 @@
         ['node_use_openssl=="true"', {
           'sources': ['binding.cc'],
           'include_dirs': ['../../../deps/openssl/openssl/include'],
-        }]
+        }],
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
       ],
-      'cflags': ['-Wno-cast-function-type'],
     },
   ]
 }
diff --git a/test/addons/openssl-client-cert-engine/binding.gyp b/test/addons/openssl-client-cert-engine/binding.gyp
@@ -18,7 +18,10 @@
               '../../../../out/<(PRODUCT_DIR)/<(openssl_product)'
             ]
           },
-        }]
+        }],
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
       ]
     }
   ]
diff --git a/test/addons/parse-encoding/binding.gyp b/test/addons/parse-encoding/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/repl-domain-abort/binding.gyp b/test/addons/repl-domain-abort/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/stringbytes-external-exceed-max/binding.gyp b/test/addons/stringbytes-external-exceed-max/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/symlinked-module/binding.gyp b/test/addons/symlinked-module/binding.gyp
@@ -3,7 +3,11 @@
     {
       'target_name': 'binding',
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/uv-handle-leak/binding.gyp b/test/addons/uv-handle-leak/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/worker-addon/binding.gyp b/test/addons/worker-addon/binding.gyp
@@ -4,7 +4,11 @@
       'target_name': 'binding',
       'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],
       'sources': [ 'binding.cc' ],
-      'cflags': ['-Wno-cast-function-type'],
+      'conditions': [
+        [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {
+          'cflags': ['-Wno-cast-function-type'],
+        }],
+      ],
     }
   ]
 }
diff --git a/test/addons/zlib-binding/binding.gyp b/test/addons/zlib-binding/binding.gyp
diff --git a/tools/doc/addon-verify.js b/tools/doc/addon-verify.js

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,11 @@`
`4`	`4`	`'target_name': 'binding',`
`5`	`5`	`'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],`
`6`	`6`	`'sources': [ 'binding.cc' ],`
`7`		`- 'cflags': ['-Wno-cast-function-type'],`
	`7`	`+ 'conditions': [`
	`8`	`+ [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {`
	`9`	`+ 'cflags': ['-Wno-cast-function-type'],`
	`10`	`+ }],`
	`11`	`+ ],`
`8`	`12`	`}`
`9`	`13`	`]`
`10`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,11 @@`
`19`	`19`	`'target_name': 'binding',`
`20`	`20`	`'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],`
`21`	`21`	`'sources': [ 'binding.cc' ],`
`22`		`- 'cflags': ['-Wno-cast-function-type'],`
	`22`	`+ 'conditions': [`
	`23`	`+ [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {`
	`24`	`+ 'cflags': ['-Wno-cast-function-type'],`
	`25`	`+ }],`
	`26`	`+ ],`
`23`	`27`	`}`
`24`	`28`	`]`
`25`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,11 @@`
`5`	`5`	`'defines': [ 'V8_DEPRECATION_WARNINGS=1' ],`
`6`	`6`	`'sources': [ 'binding.cc' ],`
`7`	`7`	`'win_delay_load_hook': 'false',`
`8`		`- 'cflags': ['-Wno-cast-function-type'],`
	`8`	`+ 'conditions': [`
	`9`	`+ [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {`
	`10`	`+ 'cflags': ['-Wno-cast-function-type'],`
	`11`	`+ }],`
	`12`	`+ ],`
`9`	`13`	`}`
`10`	`14`	`]`
`11`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,11 @@`
`3`	`3`	`{`
`4`	`4`	`'target_name': 'binding',`
`5`	`5`	`'sources': ['binding.cc'],`
`6`		`- 'cflags': ['-Wno-cast-function-type'],`
	`6`	`+ 'conditions': [`
	`7`	`+ [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {`
	`8`	`+ 'cflags': ['-Wno-cast-function-type'],`
	`9`	`+ }],`
	`10`	`+ ],`
`7`	`11`	`},`
`8`	`12`	`]`
`9`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,11 @@`
`3`	`3`	`{`
`4`	`4`	`'target_name': 'binding',`
`5`	`5`	`'sources': [ 'not_a_binding.c' ],`
`6`		`- 'cflags': ['-Wno-cast-function-type'],`
	`6`	`+ 'conditions': [`
	`7`	`+ [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {`
	`8`	`+ 'cflags': ['-Wno-cast-function-type'],`
	`9`	`+ }],`
	`10`	`+ ],`
`7`	`11`	`}`
`8`	`12`	`]`
`9`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,11 @@`
`6`	`6`	`['node_use_openssl=="true"', {`
`7`	`7`	`'sources': ['binding.cc'],`
`8`	`8`	`'include_dirs': ['../../../deps/openssl/openssl/include'],`
`9`		`- }]`
	`9`	`+ }],`
	`10`	`+ [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {`
	`11`	`+ 'cflags': ['-Wno-cast-function-type'],`
	`12`	`+ }],`
`10`	`13`	`],`
`11`		`- 'cflags': ['-Wno-cast-function-type'],`
`12`	`14`	`},`
`13`	`15`	`]`
`14`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,10 @@`
`18`	`18`	`'../../../../out/<(PRODUCT_DIR)/<(openssl_product)'`
`19`	`19`	`]`
`20`	`20`	`},`
`21`		`- }]`
	`21`	`+ }],`
	`22`	`+ [ 'OS in "linux freebsd openbsd solaris android aix cloudabi"', {`
	`23`	`+ 'cflags': ['-Wno-cast-function-type'],`
	`24`	`+ }],`
`22`	`25`	`]`
`23`	`26`	`}`
`24`	`27`	`]`