Reduce old GCC linker warnings

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7363 212acab6-be3b-0410-9dea-997c60f758d6

Author: sredna

SCons/Config/gnu

@@ -45,10 +45,21 @@ defenv['SUBSYS_WIN'] = '-Wl,--subsystem,windows'
 defenv['MSVCRT_FLAG'] = ''
 defenv['STDCALL'] = '"__attribute__((__stdcall__))"'
 
-# Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL 
+# Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL
+def configure_static_libs(env):
+	env.Append(LINKFLAGS = ['-static-libgcc'])
+	code = """
+		#define G_V (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+		#if G_V >= 10000 && G_V < 40503 // Might not be correct, 4.5.2 is known not to support it
+		#error !
+		#endif
+	"""
+	conf = FlagsConfigure(env)
+	conf.CheckLinkFlag('-static-libstdc++', codeprepend = code)
+	conf.Finish()
+
 if defenv['PLATFORM'] == 'win32':
-	defenv.Append(LINKFLAGS = ['-static-libgcc'])
-	defenv.Append(LINKFLAGS = ['-static-libstdc++'])
+	configure_static_libs(defenv)
 
 ### defines
 
@@ -144,8 +155,7 @@ if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_W32']:
 plugin_env.Append(LINKFLAGS = ['-mwindows'])        # build windows executables
 plugin_env.Append(LINKFLAGS = ['$ALIGN_FLAG'])      # 512 bytes align
 plugin_env.Append(LINKFLAGS = ['$MAP_FLAG'])        # generate map file
-plugin_env.Append(LINKFLAGS = ['-static-libgcc'])   # remove libgcc*.dll dependency
-plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency
+configure_static_libs(plugin_env)                   # remove libgcc*.dll & libstdc++*.dll dependency
 
 plugin_uenv = plugin_env.Clone()
 plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])

SCons/utils.py

@@ -108,7 +108,7 @@ def check_compile_flag(ctx, flag):
 
 	return result
 
-def check_link_flag(ctx, flag, run = 0, extension = '.c', code = None):
+def check_link_flag(ctx, flag, run = 0, extension = '.c', code = None, codeprepend = ''):
 	"""
 	Checks if a linker flag is valid.
 	"""
@@ -120,7 +120,11 @@ def check_link_flag(ctx, flag, run = 0, extension = '.c', code = None):
 	if code:
 		test =  code
 	else:
-		test = """
+		test = codeprepend + """
+			#ifdef _WIN32
+			#include <windows.h>
+			extern int WINAPI WinMain(HINSTANCE hI,HINSTANCE hOld,char*cl,int sc) { return 0; } // '-Wl,-e,___main' substitute for -nostdlib (GCC 4.5.2)
+			#endif
 			int main() {
 				return 0;
 			}

SConstruct

@@ -453,9 +453,11 @@ Import('SilentActionEcho IsPEExecutable SetPESecurityFlagsWorker MakeReproducibl
 def SetPESecurityFlagsAction(target, source, env):
 	for t in target:
 		SetPESecurityFlagsWorker(t.path)
+g_pesecflagsecho = {}
 def SetPESecurityFlagsActionEcho(target, source, env):
 	for t in target:
-		if IsPEExecutable(t.path):
+		if t.name[-4:].lower() == '.dll' and IsPEExecutable(t.path) and not t.path in g_pesecflagsecho:
+			g_pesecflagsecho[t.path] = 1
 			print('Setting PE flags on %s' % t.name)
 def SetPESecurityFlags(targets):
 	for t in targets: