FIXUP make sure this suppresses semi errors

nodesource · Sep 19, 2024 · 532a23b · 532a23b
1 parent de94b47
commit 532a23b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/node.gyp b/node.gyp
@@ -537,15 +537,14 @@
     # Putting these explicitly here so not to depend on `common.gypi`.
     # `common.gypi` need to be more general because it is used to build userland native addons.
     # Refs: https://github.com/nodejs/node-gyp/issues/1118
-    'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', '-Wno-c++98-compat-extra-semi',],
+    'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', '-Wno-c++98-compat-extra-semi', ],
     'xcode_settings': {
       'WARNING_CFLAGS': [
         '-Wall',
         '-Wendif-labels',
         '-W',
         '-Wno-unused-parameter',
         '-Werror=undefined-inline',
-        '-Werror=extra-semi',
         '-Wno-c++98-compat-extra-semi',
       ],
     },
@@ -561,7 +560,7 @@
 
     'conditions': [
       ['clang==0 and OS!="win"', {
-        'cflags': [ '-Wno-restrict', ],
+        'cflags': [ '-Wno-restrict', '-Wno-c++98-compat-extra-semi', ],
       }],
       # Pointer authentication for ARM64.
       ['target_arch=="arm64"', {
@@ -584,6 +583,7 @@
         ],
       }],
       ['OS=="linux" and clang==1', {
+        'cflags': [ '-Wno-c++98-compat-extra-semi', ],
         'libraries': ['-latomic'],
       }],
     ],
@@ -654,7 +654,7 @@
 
       'conditions': [
         [ 'error_on_warn=="true"', {
-          'cflags': ['-Werror'],
+          'cflags': ['-Werror', '-Wno-c++98-compat-extra-semi'],
           'xcode_settings': {
             'WARNING_CFLAGS': [ '-Werror' ],
           },
@@ -976,7 +976,7 @@
            ]
         }],
         [ 'error_on_warn=="true"', {
-          'cflags': ['-Werror'],
+          'cflags': ['-Werror' ],
           'xcode_settings': {
             'WARNING_CFLAGS': [ '-Werror' ],
           },

diff --git a/node.gypi b/node.gypi
@@ -342,6 +342,11 @@
 
     [ 'node_shared_otlp_http_exporter=="false"', {
       'dependencies': [ 'deps/opentelemetry-cpp/otlp-http-exporter.gyp:otlp-http-exporter' ],
+      'direct_dependent_settings': {
+        'cflags': [
+          '-Wno-c++98-compat-extra-semi',
+        ],
+      },
       'conditions': [
         [ 'force_load=="true"', {
           'xcode_settings': {