From 654dce730bfca96bb825abdf622eab1781bdd12f Mon Sep 17 00:00:00 2001 From: anders_k Date: Fri, 18 Sep 2015 17:42:04 +0000 Subject: [PATCH] All GCC stub targets use the same PE switch now git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6609 212acab6-be3b-0410-9dea-997c60f758d6 --- SCons/Config/gnu | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/SCons/Config/gnu b/SCons/Config/gnu index f6014493..2e4a6a87 100644 --- a/SCons/Config/gnu +++ b/SCons/Config/gnu @@ -214,12 +214,8 @@ conf.Finish() # sure the sections will be written in the correct order. # -if defenv['TARGET_ARCH'] == 'amd64': - stub_env.Append(LINKFLAGS = ['-B pei-x86-64']) - stub_uenv.Append(LINKFLAGS = ['-B pei-x86-64']) -else: - stub_env.Append(LINKFLAGS = ['--oformat pei-i386']) - stub_uenv.Append(LINKFLAGS = ['--oformat pei-i386']) +stub_env.Append(LINKFLAGS = ['-B', petype]) ; --oformat petype also works in GCC 4.5.2 +stub_uenv.Append(LINKFLAGS = ['-B', petype]) stub_env.Append(LINKFLAGS = ['-T', File('linker_script').rfile()]) stub_uenv.Append(LINKFLAGS = ['-T', File('linker_script').rfile()])