From d0ddb4aab04b23ebf685a3226603660965f34e73 Mon Sep 17 00:00:00 2001 From: anders_k Date: Fri, 18 Sep 2015 17:44:12 +0000 Subject: [PATCH] Actually specify a petype this time git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6610 212acab6-be3b-0410-9dea-997c60f758d6 --- SCons/Config/gnu | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SCons/Config/gnu b/SCons/Config/gnu index 2e4a6a87..1e763916 100644 --- a/SCons/Config/gnu +++ b/SCons/Config/gnu @@ -214,7 +214,10 @@ conf.Finish() # sure the sections will be written in the correct order. # -stub_env.Append(LINKFLAGS = ['-B', petype]) ; --oformat petype also works in GCC 4.5.2 +petype = 'pei-i386' +if defenv['TARGET_ARCH'] == 'amd64': + petype = 'pei-x86-64' +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()])