diff options
Diffstat (limited to 'meta/recipes-devtools/gcc/gcc-multilib-config.inc')
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-multilib-config.inc | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc index 1eafeb4768..81d664a1b3 100644 --- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc +++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc | |||
@@ -26,7 +26,8 @@ python gcc_multilib_setup() { | |||
26 | 26 | ||
27 | bb.utils.remove(build_conf_dir, True) | 27 | bb.utils.remove(build_conf_dir, True) |
28 | ml_globs = ('%s/*/t-linux64' % src_conf_dir, | 28 | ml_globs = ('%s/*/t-linux64' % src_conf_dir, |
29 | '%s/*/linux64.h' % src_conf_dir) | 29 | '%s/*/linux64.h' % src_conf_dir, |
30 | '%s/linux.h' % src_conf_dir) | ||
30 | 31 | ||
31 | # copy the target multilib config files to ${B} | 32 | # copy the target multilib config files to ${B} |
32 | for ml_glob in ml_globs: | 33 | for ml_glob in ml_globs: |
@@ -93,6 +94,14 @@ python gcc_multilib_setup() { | |||
93 | r'\1' + wrap_libdir(libdirx32) + r'\3'), | 94 | r'\1' + wrap_libdir(libdirx32) + r'\3'), |
94 | (r'^(#define\s*GLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$', | 95 | (r'^(#define\s*GLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$', |
95 | r'\1' + wrap_libdir(libdirn32) + r'\3'), | 96 | r'\1' + wrap_libdir(libdirn32) + r'\3'), |
97 | (r'^(#define\s*UCLIBC_DYNAMIC_LINKER32\s*)(\S+)(\s*\".*\")$', | ||
98 | r'\1' + wrap_libdir(libdir32) + r'\3'), | ||
99 | (r'^(#define\s*UCLIBC_DYNAMIC_LINKER64\s*)(\S+)(\s*\".*\")$', | ||
100 | r'\1' + wrap_libdir(libdir64) + r'\3'), | ||
101 | (r'^(#define\s*UCLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\".*\")$', | ||
102 | r'\1' + wrap_libdir(libdirn32) + r'\3'), | ||
103 | (r'^(#define\s*UCLIBC_DYNAMIC_LINKER\s*)(\S+)(\s*\".*\")$', | ||
104 | r'\1' + wrap_libdir(libdir32) + r'\3'), | ||
96 | ] | 105 | ] |
97 | 106 | ||
98 | for (i, line) in enumerate(filelines): | 107 | for (i, line) in enumerate(filelines): |