Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # -*- python -*- | 1 # -*- python -*- |
| 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. | 2 # Copyright (c) 2012 The Native Client Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 import platform | 6 import platform |
| 7 import os | 7 import os |
| 8 | 8 |
| 9 Import('env') | 9 Import('env') |
| 10 | 10 |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 347 'nacl_fault_inject', | 347 'nacl_fault_inject', |
| 348 'platform', | 348 'platform', |
| 349 ]) | 349 ]) |
| 350 env.Requires(SEL_LDR_NODE, crt) | 350 env.Requires(SEL_LDR_NODE, crt) |
| 351 | 351 |
| 352 env.SDKInstallBin('sel_ldr', SEL_LDR_NODE) | 352 env.SDKInstallBin('sel_ldr', SEL_LDR_NODE) |
| 353 | 353 |
| 354 env.EnsureRequiredBuildWarnings() | 354 env.EnsureRequiredBuildWarnings() |
| 355 | 355 |
| 356 # Bootstrap loader used on Linux. | 356 # Bootstrap loader used on Linux. |
| 357 if env.Bit('linux') and not env.CrossToolsBuild(): | 357 if env.Bit('linux') and not env.CrossToolsBuild() and not env.Bit('built_elsewhe re'): |
|
robertm
2012/03/22 14:09:37
line length
(google.com) Derek Schuff
2012/03/22 16:10:25
Done.
| |
| 358 bootstrap_env = env.Clone() | 358 bootstrap_env = env.Clone() |
| 359 bootstrap_env.Replace(CLANG_OPTS='') | 359 bootstrap_env.Replace(CLANG_OPTS='') |
| 360 bootstrap_env.FilterOut(CCFLAGS=['-fstack-protector', '-fPIC', '-fPIE', | 360 bootstrap_env.FilterOut(CCFLAGS=['-fstack-protector', '-fPIC', '-fPIE', |
| 361 '-pedantic', '$COVERAGE_CCFLAGS'], | 361 '-pedantic', '$COVERAGE_CCFLAGS'], |
| 362 CFLAGS=['-Wdeclaration-after-statement']) | 362 CFLAGS=['-Wdeclaration-after-statement']) |
| 363 bootstrap_env.Append(CCFLAGS=['-fno-pic', '-fno-PIC', '-fno-pie', '-fno-pie', | 363 bootstrap_env.Append(CCFLAGS=['-fno-pic', '-fno-PIC', '-fno-pie', '-fno-pie', |
| 364 '-fno-stack-protector']) | 364 '-fno-stack-protector']) |
| 365 if env.Bit('clang'): | 365 if env.Bit('clang'): |
| 366 bootstrap_env.Append(CCFLAGS=['-ffreestanding', | 366 bootstrap_env.Append(CCFLAGS=['-ffreestanding', |
| 367 '-U__STDC_HOSTED__', | 367 '-U__STDC_HOSTED__', |
| (...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 950 # TODO(tuduce): Make it work on windows. | 950 # TODO(tuduce): Make it work on windows. |
| 951 env.AddNodeToTestSuite(node, ['medium_tests'], | 951 env.AddNodeToTestSuite(node, ['medium_tests'], |
| 952 'run_sel_ldr_thread_death_test', | 952 'run_sel_ldr_thread_death_test', |
| 953 is_broken=env.Bit('windows')) | 953 is_broken=env.Bit('windows')) |
| 954 | 954 |
| 955 | 955 |
| 956 # This currently tests linking of sel_main_chrome.c *only*. We do not | 956 # This currently tests linking of sel_main_chrome.c *only*. We do not |
| 957 # expect this program to do anything meaningful when run. | 957 # expect this program to do anything meaningful when run. |
| 958 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'], | 958 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'], |
| 959 EXTRA_LIBS=sel_ldr_libs) | 959 EXTRA_LIBS=sel_ldr_libs) |
| OLD | NEW |