diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-devtools/gcc/gcc-multilib-config.inc | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-multilib-config.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-multilib-config.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc index a0a2ac09a7..31b8619be3 100644 --- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc +++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc | |||
@@ -21,8 +21,8 @@ python gcc_multilib_setup() { | |||
21 | import shutil | 21 | import shutil |
22 | import glob | 22 | import glob |
23 | 23 | ||
24 | srcdir = d.getVar('S', True) | 24 | srcdir = d.getVar('S') |
25 | builddir = d.getVar('B', True) | 25 | builddir = d.getVar('B') |
26 | src_conf_dir = '%s/gcc/config' % srcdir | 26 | src_conf_dir = '%s/gcc/config' % srcdir |
27 | build_conf_dir = '%s/gcc/config' % builddir | 27 | build_conf_dir = '%s/gcc/config' % builddir |
28 | 28 | ||
@@ -43,12 +43,12 @@ python gcc_multilib_setup() { | |||
43 | bb.utils.mkdirhier('%s/%s' % (build_conf_dir, parent_dir)) | 43 | bb.utils.mkdirhier('%s/%s' % (build_conf_dir, parent_dir)) |
44 | bb.utils.copyfile(fn, '%s/%s' % (build_conf_dir, rel_path)) | 44 | bb.utils.copyfile(fn, '%s/%s' % (build_conf_dir, rel_path)) |
45 | 45 | ||
46 | pn = d.getVar('PN', True) | 46 | pn = d.getVar('PN') |
47 | multilibs = (d.getVar('MULTILIB_VARIANTS', True) or '').split() | 47 | multilibs = (d.getVar('MULTILIB_VARIANTS') or '').split() |
48 | if not multilibs and pn != "nativesdk-gcc": | 48 | if not multilibs and pn != "nativesdk-gcc": |
49 | return | 49 | return |
50 | 50 | ||
51 | mlprefix = d.getVar('MLPREFIX', True) | 51 | mlprefix = d.getVar('MLPREFIX') |
52 | 52 | ||
53 | if ('%sgcc' % mlprefix) != pn and (not pn.startswith('gcc-cross-canadian')) and pn != "nativesdk-gcc": | 53 | if ('%sgcc' % mlprefix) != pn and (not pn.startswith('gcc-cross-canadian')) and pn != "nativesdk-gcc": |
54 | return | 54 | return |
@@ -155,10 +155,10 @@ python gcc_multilib_setup() { | |||
155 | libdirn32 = 'SYSTEMLIBS_DIR' | 155 | libdirn32 = 'SYSTEMLIBS_DIR' |
156 | 156 | ||
157 | 157 | ||
158 | target_arch = (d.getVar('TARGET_ARCH_MULTILIB_ORIGINAL', True) if mlprefix | 158 | target_arch = (d.getVar('TARGET_ARCH_MULTILIB_ORIGINAL') if mlprefix |
159 | else d.getVar('TARGET_ARCH', True)) | 159 | else d.getVar('TARGET_ARCH')) |
160 | if pn == "nativesdk-gcc": | 160 | if pn == "nativesdk-gcc": |
161 | header_config_files = gcc_header_config_files[d.getVar("SDK_ARCH", True)] | 161 | header_config_files = gcc_header_config_files[d.getVar("SDK_ARCH")] |
162 | write_headers(builddir, header_config_files, libdir32, libdir64, libdirx32, libdirn32) | 162 | write_headers(builddir, header_config_files, libdir32, libdir64, libdirx32, libdirn32) |
163 | return | 163 | return |
164 | 164 | ||
@@ -188,7 +188,7 @@ python gcc_multilib_setup() { | |||
188 | optsets = [] | 188 | optsets = [] |
189 | 189 | ||
190 | for ml in ml_list: | 190 | for ml in ml_list: |
191 | tune = d.getVar(ml, True) | 191 | tune = d.getVar(ml) |
192 | if not tune: | 192 | if not tune: |
193 | bb.warn("%s doesn't have a corresponding tune. Skipping..." % ml) | 193 | bb.warn("%s doesn't have a corresponding tune. Skipping..." % ml) |
194 | continue | 194 | continue |
@@ -212,7 +212,7 @@ python gcc_multilib_setup() { | |||
212 | 212 | ||
213 | # take out '-' mcpu='s and march='s from parameters | 213 | # take out '-' mcpu='s and march='s from parameters |
214 | opts = [] | 214 | opts = [] |
215 | whitelist = (d.getVar("MULTILIB_OPTION_WHITELIST", True) or "").split() | 215 | whitelist = (d.getVar("MULTILIB_OPTION_WHITELIST") or "").split() |
216 | for i in d.expand(tune_parameters['ccargs']).split(): | 216 | for i in d.expand(tune_parameters['ccargs']).split(): |
217 | if i in whitelist: | 217 | if i in whitelist: |
218 | # Need to strip '-' from option | 218 | # Need to strip '-' from option |