mirrors/meta-rust
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rust: fix CROSS_PREFIX setting and set JEMALLOC_CFLAGS

Browse Source
This commit is contained in:
Cody P Schafer
2014-11-17 16:37:27 -05:00
parent be479a8e39
commit 300e709464
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
recipes/rust/rust.inc
+2 -1
View File
@@ -196,13 +196,14 @@ def rust_gen_mk_cfg(d, thing):
# by rust's build system). We delete and then insert this because not # by rust's build system). We delete and then insert this because not
# all targets define it. # all targets define it.
'-e', 's/^CROSS_PREFIX_{}.*$//'.format(sys), '-e', 's/^CROSS_PREFIX_{}.*$//'.format(sys),
'-e', '/^.*$/a CROSS_PREFIX_{} := {}'.format(sys, prefix), '-e', '2 a CROSS_PREFIX_{} := {}'.format(sys, prefix),
'-e', 's/^CC_{}=.*$/CC_{} := gcc/'.format(sys, sys), '-e', 's/^CC_{}=.*$/CC_{} := gcc/'.format(sys, sys),
'-e', 's/^CXX_{}.*$/CXX_{} := g++/'.format(sys, sys), '-e', 's/^CXX_{}.*$/CXX_{} := g++/'.format(sys, sys),
'-e', 's/^CPP_{}.*$/CPP_{} := gcc -E/'.format(sys, sys), '-e', 's/^CPP_{}.*$/CPP_{} := gcc -E/'.format(sys, sys),
'-e', 's/^AR_{}.*$/AR_{} := ar/'.format(sys, sys), '-e', 's/^AR_{}.*$/AR_{} := ar/'.format(sys, sys),
# Append our flags to the existing ones # Append our flags to the existing ones
'-e', '/^CFG_JEMALLOC_CFLAGS/ s;$; {};'.format(cflags_for(d, thing)),
'-e', '/^CFG_GCCISH_CFLAGS/ s;$; {};'.format(cflags_for(d, thing)), '-e', '/^CFG_GCCISH_CFLAGS/ s;$; {};'.format(cflags_for(d, thing)),
'-e', '/^CFG_GCCISH_CXXFLAGS/ s;$; {};'.format(cxxflags_for(d, thing)), '-e', '/^CFG_GCCISH_CXXFLAGS/ s;$; {};'.format(cxxflags_for(d, thing)),
'-e', '/^CFG_GCCISH_LINK_FLAGS/ s;$; {};'.format(" ".join(ldflags_for(d, thing))), '-e', '/^CFG_GCCISH_LINK_FLAGS/ s;$; {};'.format(" ".join(ldflags_for(d, thing))),