dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed bug #1800834 - CVS FTBFS with new mingw32

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5294 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-09-29 10:13:07 +00:00
parent cbe80ab734
commit 70e0fec9e5
1 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

25
SCons/Config/gnu
View file

@ -207,10 +207,31 @@ cenv = defenv.Clone()
cross_env(cenv) cross_env(cenv)
conf = cenv.Configure(custom_tests = { 'CheckRequirement' : check_requirement }) conf = cenv.Configure(custom_tests = { 'CheckRequirement' : check_requirement })
if conf.CheckRequirement('memcpy', 'struct s { char c[128]; } t = { "test" };'): memcpy_test = """
struct s // gcc 3
{
char c[128];
} t = { "test" };
char a[] = // gcc 4
{'/', 'F', 'I' ,'L', 'L', 'S', 'C', 'R', 'E', 'E', 'N', 0};
int i;
for (i = 0; i < 100; i++) // avoid a and t being optimized out
{
i += a[i] ^ t.c[i];
}
return i;
"""
memset_test = """
char c[128] = "test";
c[0] = '6'; // avoid c being optimized out
return c[1]; // avoid c being optimized out
"""
if conf.CheckRequirement('memcpy', memcpy_test):
add_file('memcpy.c') add_file('memcpy.c')
if conf.CheckRequirement('memset', 'char c[128] = "test";'): if conf.CheckRequirement('memset', memset_test):
add_file('memset.c') add_file('memset.c')
conf.Finish() conf.Finish()