From ea0073fae742eb6fe56216ca19cf2242c4deca3f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 17 Nov 2019 21:41:46 +0100 Subject: [PATCH] Don't use -Wno-deprecated-copy on older GCC. --- wscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 9b18f6013..eff2b0438 100644 --- a/wscript +++ b/wscript @@ -116,6 +116,8 @@ def configure(conf): gcc = conf.env['CC_VERSION'] if int(gcc[0]) >= 4 and int(gcc[1]) > 1: conf.env.append_value('CXXFLAGS', ['-Wno-unused-result']) + if int(gcc[0]) >= 9: + conf.env.append_value('CXXFLAGS', ['-Wno-deprecated-copy']) have_c11 = int(gcc[0]) >= 4 and int(gcc[1]) >= 8 and int(gcc[2]) >= 1 if conf.options.enable_debug: @@ -186,7 +188,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DLINUX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX']) conf.env.append_value('CXXFLAGS', '-DLINUX_SHARE_PREFIX="%s/share/dcpomatic2"' % conf.env['INSTALL_PREFIX']) conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_LINUX') - conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align', '-Wno-deprecated-copy']) + conf.env.append_value('CXXFLAGS', ['-Wlogical-op', '-Wcast-align']) if not conf.env.DISABLE_GUI: conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True) -- 2.30.2