From bebb04178937d8049b809e67de6f5a1201029eda Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Fri, 13 Apr 2007 10:29:24 +0000
Subject: [PATCH] more of bug #1676243 - compiler warnings on Linux

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

diff --git a/SCons/Config/default b/SCons/Config/default
index 50e9802f..709ab3b9 100644
--- a/SCons/Config/default
+++ b/SCons/Config/default
@@ -13,7 +13,6 @@ 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 6e8cc187..6bb5d813 100644
--- a/SCons/Config/gnu
+++ b/SCons/Config/gnu
@@ -31,7 +31,6 @@ 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
 
@@ -83,6 +82,7 @@ makensis_env = defenv.Clone()
 if not defenv['DEBUG']:
 	makensis_env.Append(CCFLAGS = '-O2')            # optimize
 makensis_env.Append(CCFLAGS = '-Wall')            # all warnings
+makensis_env.Append(CCFLAGS = '-Wno-non-virtual-dtor') # ignore virtual dtor warnings
 
 conf = FlagsConfigure(makensis_env)
 conf.CheckLinkFlag('-m32')                        # 
diff --git a/SCons/Config/ms b/SCons/Config/ms
index 48a0dd86..1b9a41da 100644
--- a/SCons/Config/ms
+++ b/SCons/Config/ms
@@ -12,7 +12,6 @@ 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 c683840b..9dc9a7f9 100644
--- a/Source/SConscript
+++ b/Source/SConscript
@@ -83,7 +83,6 @@ 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