SHOW:
|
|
- or go back to the newest paste.
1 | --- ocelot/scripts/build_environment.py 2013-04-02 17:19:10.414077836 +0200 | |
2 | +++ ocelot/scripts/build_environment_fixed.py 2013-04-02 12:00:31.932313645 +0200 | |
3 | @@ -114,7 +114,7 @@ | |
4 | elif os.name == 'posix': | |
5 | ext = "" | |
6 | if os.path.exists(os.path.join(lib_path, 'libboost_system-mt.so')): | |
7 | - ext = "-mt" | |
8 | + ext = "" | |
9 | ||
10 | libs = ['-lboost_system' + ext, '-lboost_filesystem' + ext, | |
11 | '-lboost_thread' + ext] | |
12 | @@ -302,15 +302,15 @@ | |
13 | # a compiler switch of interest to the specific switch implementing the feature | |
14 | gCompilerOptions = { | |
15 | 'gcc' : {'warn_all' : '-Wall', | |
16 | - 'warn_errors' : '-Werror', | |
17 | + 'warn_errors' : '-Wall', | |
18 | 'optimization' : '-O2', 'debug' : '-g', | |
19 | 'exception_handling' : '', 'standard': ''}, | |
20 | 'g++' : {'warn_all' : '-Wall', | |
21 | - 'warn_errors' : '-Werror', | |
22 | + 'warn_errors' : '-Wall', | |
23 | 'optimization' : '-O2', 'debug' : '-g', | |
24 | 'exception_handling' : '', 'standard': '-std=c++0x'}, | |
25 | 'c++' : {'warn_all' : '-Wall', | |
26 | - 'warn_errors' : '-Werror', | |
27 | + 'warn_errors' : '-Wall', | |
28 | 'optimization' : '-O2', 'debug' : '-g', | |
29 | 'exception_handling' : '', | |
30 | 'standard': ['-stdlib=libc++', '-std=c++0x', '-pthread']}, | |
31 | @@ -516,7 +516,7 @@ | |
32 | allowed_values = ('release', 'debug'))) | |
33 | ||
34 | # add a variable to treat warnings as errors | |
35 | - vars.Add(BoolVariable('Werror', 'Treat warnings as errors', 1)) | |
36 | + vars.Add(BoolVariable('Wall', 'Treat warnings as errors', 1)) | |
37 | ||
38 | # add a variable to handle warnings | |
39 | vars.Add(BoolVariable('Wall', 'Enable all compilation warnings', 1)) | |
40 | @@ -596,11 +596,11 @@ | |
41 | ||
42 | # get C compiler switches | |
43 | env.AppendUnique(CFLAGS = getCFLAGS(env['mode'], env['Wall'], \ | |
44 | - env['Werror'], env.subst('$CC'))) | |
45 | + env['Wall'], env.subst('$CC'))) | |
46 | ||
47 | # get CXX compiler switches | |
48 | env.AppendUnique(CXXFLAGS = getCXXFLAGS(env['mode'], env['Wall'], \ | |
49 | - env['Werror'], env.subst('$CXX'))) | |
50 | + env['Wall'], env.subst('$CXX'))) | |
51 | ||
52 | # get linker switches | |
53 | env.AppendUnique(LINKFLAGS = getLINKFLAGS(env['mode'], env.subst('$LINK'))) |