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

Unified Diff: SConstruct

Issue 11151031: [MIPS] Update SConstruct to use new MIPS toolchain. (Closed) Base URL: http://git.chromium.org/native_client/src/native_client.git@master
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/trusted/service_runtime/arch/mips/nacl_switch_to_app_mips.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: SConstruct
diff --git a/SConstruct b/SConstruct
index 668cfcf882e7337d3b3448cac3d504dd8b36b8f6..8282e052ed63bd89dfca823ca01ab4a65d01f30a 100755
--- a/SConstruct
+++ b/SConstruct
@@ -2361,26 +2361,26 @@ def SetupLinuxEnvMips(env):
env.Replace(EMULATOR=jail + '/run_under_qemu_mips32')
else:
tc_dir = os.path.join(os.getcwd(), 'toolchain', 'linux_mips-trusted',
- 'mips-release', 'bin')
- if not which(os.path.join(tc_dir, 'mips-linux-gnu-gcc')):
+ 'bin')
+ if not which(os.path.join(tc_dir, 'mipsel-linux-gnu-gcc')):
print ("\nERRROR: MIPS trusted TC is not installed - try running:\n"
"tools/trusted_cross_toolchains/trusted-toolchain-creator"
".mipsel.squeeze.sh trusted_sdk")
sys.exit(-1)
- env.Replace(CC=os.path.join(tc_dir, 'mips-linux-gnu-gcc'),
- CXX=os.path.join(tc_dir, 'mips-linux-gnu-g++'),
- LD=os.path.join(tc_dir, 'mips-linux-gnu-ld'),
+ env.Replace(CC=os.path.join(tc_dir, 'mipsel-linux-gnu-gcc'),
+ CXX=os.path.join(tc_dir, 'mipsel-linux-gnu-g++'),
+ LD=os.path.join(tc_dir, 'mipsel-linux-gnu-ld'),
EMULATOR=os.path.join(jail,
'run_under_qemu_mips32'),
ASFLAGS=[],
LIBPATH=['${LIB_DIR}',
- jail + '/mips-release/mips-linux-gnu/libc/el/usr/lib'],
- LINKFLAGS=['-EL', '-T',
+ jail + '/sysroot/usr/lib'],
+ LINKFLAGS=['-T',
os.path.join(jail, 'ld_script_mips_trusted')]
)
env.Append(LIBS=['rt', 'dl', 'pthread'],
- CCFLAGS=['-EL', '-Wl, -EL', '-march=mips32r2'])
+ CCFLAGS=['-march=mips32r2'])
def MakeLinuxEnv():
« no previous file with comments | « no previous file | src/trusted/service_runtime/arch/mips/nacl_switch_to_app_mips.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698