Attempt to remove -Wshadow if already added

Zylann · Jun 3, 2023 · 984fd76 · 984fd76
1 parent b398b89
commit 984fd76
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/thirdparty/fast_noise_2/SConscript b/thirdparty/fast_noise_2/SConscript
@@ -63,7 +63,12 @@ else:
  env_fn2.Append(CXXFLAGS=["-Wno-class-memaccess"]) 
  # Since may 2023 Godot build scripts warn heavily against variable name shadowing.
  # Example: Metadata.h NameDesc constructor, prevents from building because treated as error.
+ # TODO This doesn't work because for some reason `-Wshadow` FOLLOWS this parameter in the command line, as if Godot
+ # adds it AFTER parsing this SCons file...
  env_fn2.Append(CXXFLAGS=["-Wno-shadow"])
+ print("DDD ", env_fn2['CXXFLAGS'])
+ if '-Wshadow' in env_fn2['CXXFLAGS']:
+ env_fn2['CXXFLAGS'].remove('-Wshadow')
 
 env_fn2_scalar = env_fn2.Clone()
 env_fn2_sse2 = env_fn2.Clone()