]> code.ossystems Code Review - openembedded-core.git/commitdiff
gcc-target.inc: Add support for executable thats may have a suffix
authorMark Hatle <mark.hatle@windriver.com>
Tue, 20 Oct 2015 16:29:37 +0000 (11:29 -0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 24 Oct 2015 11:17:50 +0000 (12:17 +0100)
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.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-devtools/gcc/gcc-target.inc

index 6e160c0d1ce73844a24a2142c8cb3b0862e51c4f..d62c15afd81e161b4aebf819a823d5e9a0ec5f67 100644 (file)
@@ -31,7 +31,7 @@ PACKAGES = "\
 
 FILES_${PN} = "\
     ${bindir}/${TARGET_PREFIX}gcc* \
-    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2 \
+    ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/collect2* \
     ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc* \
     ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lto* \
     ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/lib*${SOLIBS} \
@@ -83,20 +83,20 @@ FILES_gfortran-symlinks = "\
     ${bindir}/f95"
 
 FILES_cpp = "\
-    ${bindir}/${TARGET_PREFIX}cpp \
+    ${bindir}/${TARGET_PREFIX}cpp* \
     ${base_libdir}/cpp \
     ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1"
 FILES_cpp-symlinks = "${bindir}/cpp"
 
-FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov \
-    ${bindir}/${TARGET_PREFIX}gcov-tool \
+FILES_gcov = "${bindir}/${TARGET_PREFIX}gcov* \
+    ${bindir}/${TARGET_PREFIX}gcov-tool* \
 "
 FILES_gcov-symlinks = "${bindir}/gcov \
     ${bindir}/gcov-tool \
 "
 
 FILES_g++ = "\
-    ${bindir}/${TARGET_PREFIX}g++ \
+    ${bindir}/${TARGET_PREFIX}g++* \
     ${libexecdir}/gcc/${TARGET_SYS}/${BINV}/cc1plus \
 "
 FILES_g++-symlinks = "\
@@ -141,7 +141,7 @@ do_install () {
        cd ${D}${bindir}
 
        # We care about g++ not c++
-       rm -f *c++
+       rm -f *c++*
 
        # We don't care about the gcc-<version> ones for this
        rm -f *gcc-?.?*