diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2015-10-20 11:29:37 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-27 07:24:27 +0000 |
commit | 54b7471be72ffc20d99dd48c0d8fdea5e399eecc (patch) | |
tree | a7bc822e65371dbc0e7326ef97eaa8d7dc430dcc | |
parent | 0d69a171d915c2cd7b25df81ca5350f1d9efb885 (diff) | |
download | poky-54b7471be72ffc20d99dd48c0d8fdea5e399eecc.tar.gz |
gcc-target.inc: Add support for executable thats may have a suffix
In the past GCC has used a wildcard to permit generating executables
that may have a suffix, such as .exe. This wild card was lost in one
of the updates. Adding the wild card back in fixes a number of issues
when generating a mingw gcc.
(From OE-Core rev: 1003e93a1b3359a98fb631eeeda3fda184832288)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/gcc/gcc-target.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index 6e160c0d1c..d62c15afd8 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc | |||
@@ -31,7 +31,7 @@ PACKAGES = "\ | |||
31 | 31 | ||
32 | FILES_${PN} = "\ | 32 | FILES_${PN} = "\ |
33 | ${bindir}/${TARGET_PREFIX}gcc* \ | 33 | ${bindir}/${TARGET_PREFIX}gcc* \ |
34 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \ | 34 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \ |
35 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \ | 35 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \ |
36 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \ | 36 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \ |
37 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ | 37 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \ |
@@ -83,20 +83,20 @@ FILES_gfortran-symlinks = "\ | |||
83 | ${bindir}/f95" | 83 | ${bindir}/f95" |
84 | 84 | ||
85 | FILES_cpp = "\ | 85 | FILES_cpp = "\ |
86 | ${bindir}/${TARGET_PREFIX}cpp \ | 86 | ${bindir}/${TARGET_PREFIX}cpp* \ |
87 | ${base_libdir}/cpp \ | 87 | ${base_libdir}/cpp \ |
88 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1" | 88 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1" |
89 | FILES_cpp-symlinks = "${bindir}/cpp" | 89 | FILES_cpp-symlinks = "${bindir}/cpp" |
90 | 90 | ||
91 | FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov \ | 91 | FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov* \ |
92 | ${bindir}/${TARGET_PREFIX}gcov-tool \ | 92 | ${bindir}/${TARGET_PREFIX}gcov-tool* \ |
93 | " | 93 | " |
94 | FILES_gcov-symlinks = "${bindir}/gcov \ | 94 | FILES_gcov-symlinks = "${bindir}/gcov \ |
95 | ${bindir}/gcov-tool \ | 95 | ${bindir}/gcov-tool \ |
96 | " | 96 | " |
97 | 97 | ||
98 | FILES_g++ = "\ | 98 | FILES_g++ = "\ |
99 | ${bindir}/${TARGET_PREFIX}g++ \ | 99 | ${bindir}/${TARGET_PREFIX}g++* \ |
100 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ | 100 | ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \ |
101 | " | 101 | " |
102 | FILES_g++-symlinks = "\ | 102 | FILES_g++-symlinks = "\ |
@@ -141,7 +141,7 @@ do_install () { | |||
141 | cd ${D}${bindir} | 141 | cd ${D}${bindir} |
142 | 142 | ||
143 | # We care about g++ not c++ | 143 | # We care about g++ not c++ |
144 | rm -f *c++ | 144 | rm -f *c++* |
145 | 145 | ||
146 | # We don't care about the gcc-<version> ones for this | 146 | # We don't care about the gcc-<version> ones for this |
147 | rm -f *gcc-?.?* | 147 | rm -f *gcc-?.?* |