From 3608995944dfed2e6d284ec9e07580ef430f7a35 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Wed, 11 Apr 2007 20:54:00 +0000
Subject: [PATCH] added -Wno-non-virtual-dtor for 7zip files on gnu
 configuration for bug #1676243

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5051 212acab6-be3b-0410-9dea-997c60f758d6
---
 SCons/Config/default | 1 +
 SCons/Config/gnu     | 1 +
 SCons/Config/ms      | 1 +
 Source/SConscript    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/SCons/Config/default b/SCons/Config/default
index 709ab3b9..50e9802f 100644
--- a/SCons/Config/default
+++ b/SCons/Config/default
@@ -13,6 +13,7 @@ defenv['CPP_FLAG'] = ''
 defenv['CPP_REQUIRES_STDLIB'] = 0
 defenv['SUBSYS_CON'] = ''
 defenv['MSVCRT_FLAG'] = ''
+defenv['IGNORE_VDTOR_WARN'] = ''
 
 ### stub environment
 
diff --git a/SCons/Config/gnu b/SCons/Config/gnu
index c3b6f006..6e8cc187 100644
--- a/SCons/Config/gnu
+++ b/SCons/Config/gnu
@@ -31,6 +31,7 @@ defenv['ALIGN_FLAG'] = '-Wl,--file-alignment,512'
 defenv['CPP_REQUIRES_STDLIB'] = 1
 defenv['SUBSYS_CON'] = '-Wl,--subsystem,console'
 defenv['MSVCRT_FLAG'] = ''
+defenv['IGNORE_VDTOR_WARN'] = '-Wno-non-virtual-dtor'
 
 ### helper functions
 
diff --git a/SCons/Config/ms b/SCons/Config/ms
index 1b9a41da..48a0dd86 100644
--- a/SCons/Config/ms
+++ b/SCons/Config/ms
@@ -12,6 +12,7 @@ defenv['CPP_FLAG'] = '/TP'
 defenv['CPP_REQUIRES_STDLIB'] = 0
 defenv['SUBSYS_CON'] = '/subsystem:console'
 defenv['MSVCRT_FLAG'] = '/MD'
+defenv['IGNORE_VDTOR_WARN'] = ''
 
 if float(defenv['MSVS_VERSION'].replace('Exp','')) >= 8.0:
 	defenv['EXCEPTION_FLAG'] = '/EHsc'
diff --git a/Source/SConscript b/Source/SConscript
index 9dc9a7f9..c683840b 100644
--- a/Source/SConscript
+++ b/Source/SConscript
@@ -83,6 +83,7 @@ env.Append(CPPDEFINES = ['_WIN32_IE=0x0500'])
 
 lzma_env = env.Clone()
 lzma_env.Append(CPPDEFINES = ['COMPRESS_MF_BT'])
+lzma_env.Append(CCFLAGS = ['$IGNORE_VDTOR_WARN'])
 lzma_files = lzma_env.Object(lzma_files)
 
 ##### Compile makensis