Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: src/trusted/service_runtime/build.scons

Issue 9824001: Change built_elsewhere flag to work with pexe mode (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: comments Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « site_scons/site_tools/naclsdk.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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
358 not env.Bit('built_elsewhere')):
358 bootstrap_env = env.Clone() 359 bootstrap_env = env.Clone()
359 bootstrap_env.Replace(CLANG_OPTS='') 360 bootstrap_env.Replace(CLANG_OPTS='')
360 bootstrap_env.FilterOut(CCFLAGS=['-fstack-protector', '-fPIC', '-fPIE', 361 bootstrap_env.FilterOut(CCFLAGS=['-fstack-protector', '-fPIC', '-fPIE',
361 '-pedantic', '$COVERAGE_CCFLAGS'], 362 '-pedantic', '$COVERAGE_CCFLAGS'],
362 CFLAGS=['-Wdeclaration-after-statement']) 363 CFLAGS=['-Wdeclaration-after-statement'])
363 bootstrap_env.Append(CCFLAGS=['-fno-pic', '-fno-PIC', '-fno-pie', '-fno-pie', 364 bootstrap_env.Append(CCFLAGS=['-fno-pic', '-fno-PIC', '-fno-pie', '-fno-pie',
364 '-fno-stack-protector']) 365 '-fno-stack-protector'])
365 if env.Bit('clang'): 366 if env.Bit('clang'):
366 bootstrap_env.Append(CCFLAGS=['-ffreestanding', 367 bootstrap_env.Append(CCFLAGS=['-ffreestanding',
367 '-U__STDC_HOSTED__', 368 '-U__STDC_HOSTED__',
(...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 # TODO(tuduce): Make it work on windows. 951 # TODO(tuduce): Make it work on windows.
951 env.AddNodeToTestSuite(node, ['medium_tests'], 952 env.AddNodeToTestSuite(node, ['medium_tests'],
952 'run_sel_ldr_thread_death_test', 953 'run_sel_ldr_thread_death_test',
953 is_broken=env.Bit('windows')) 954 is_broken=env.Bit('windows'))
954 955
955 956
956 # This currently tests linking of sel_main_chrome.c *only*. We do not 957 # This currently tests linking of sel_main_chrome.c *only*. We do not
957 # expect this program to do anything meaningful when run. 958 # expect this program to do anything meaningful when run.
958 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'], 959 env.ComponentProgram('sel_main_chrome_test', ['sel_main_chrome_test.c'],
959 EXTRA_LIBS=sel_ldr_libs) 960 EXTRA_LIBS=sel_ldr_libs)
OLDNEW
« no previous file with comments | « site_scons/site_tools/naclsdk.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698