Skip to content

Commit 8fbde69

Browse files
committed
waf: stop setting CXX flags based on C compiler version
1 parent a619e39 commit 8fbde69

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

Tools/ardupilotwaf/boards.py

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -294,14 +294,6 @@ def configure_env(self, cfg, env):
294294
'-Wno-format-contains-nul',
295295
'-fsingle-precision-constant', # force const vals to be float , not double. so 100.0 means 100.0f
296296
]
297-
if self.cc_version_gte(cfg, 7, 4):
298-
env.CXXFLAGS += [
299-
'-Werror=implicit-fallthrough',
300-
]
301-
env.CXXFLAGS += [
302-
'-fsingle-precision-constant',
303-
'-Wno-psabi',
304-
]
305297

306298
if cfg.env.DEBUG:
307299
env.CFLAGS += [
@@ -429,6 +421,8 @@ def configure_env(self, cfg, env):
429421
env.CXXFLAGS += [
430422
'-Wno-format-contains-nul',
431423
'-Werror=unused-but-set-variable'
424+
'-fsingle-precision-constant',
425+
'-Wno-psabi',
432426
]
433427
if self.cc_version_gte(cfg, 5, 2):
434428
env.CXXFLAGS += [

0 commit comments

Comments
 (0)