From be0ba361a6c91e0952a32b17c1a3ee87b5c6ff58 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 21 May 2005 13:13:36 +0000 Subject: [PATCH] MAP_FLAG no longer needs to be a function git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4041 212acab6-be3b-0410-9dea-997c60f758d6 --- SCons/Config/default | 2 +- SCons/Config/gnu | 2 +- SCons/Config/ms | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/SCons/Config/default b/SCons/Config/default index fa40ec77..77eb550b 100644 --- a/SCons/Config/default +++ b/SCons/Config/default @@ -5,7 +5,7 @@ Import('defenv') ### flags defenv['ENTRY_FLAG'] = lambda x: '' -defenv['MAP_FLAG'] = lambda x: '' +defenv['MAP_FLAG'] = '' defenv['EXCEPTION_FLAG'] = '' defenv['NODEFLIBS_FLAG'] = '' defenv['C_FLAG'] = '' diff --git a/SCons/Config/gnu b/SCons/Config/gnu index c1614ff8..8cc6e2ad 100644 --- a/SCons/Config/gnu +++ b/SCons/Config/gnu @@ -17,7 +17,7 @@ def cross_env(env): ### flags defenv['ENTRY_FLAG'] = lambda x: '-Wl,-e,_' + x + '@16' -defenv['MAP_FLAG'] = lambda x: '-Wl,-Map,${TARGET.base}.map' +defenv['MAP_FLAG'] = '-Wl,-Map,${TARGET.base}.map' defenv['EXCEPTION_FLAG'] = '' defenv['NODEFLIBS_FLAG'] = '-nostdlib -Wl,--exclude-libs,msvcrt.a' defenv['C_FLAG'] = '-x c' diff --git a/SCons/Config/ms b/SCons/Config/ms index 1bcee791..60e72bd0 100644 --- a/SCons/Config/ms +++ b/SCons/Config/ms @@ -5,7 +5,7 @@ Import('defenv') ### flags defenv['ENTRY_FLAG'] = lambda x: '/entry:' + x -defenv['MAP_FLAG'] = lambda x: '/map' +defenv['MAP_FLAG'] = '/map' defenv['EXCEPTION_FLAG'] = '/GX' defenv['NODEFLIBS_FLAG'] = '/NODEFAULTLIB' defenv['C_FLAG'] = '/TC'