gcc-runtime: Move core code to the main include file
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
ccebaa67df
commit
95fd994366
|
@ -3,3 +3,49 @@ require gcc-configure-common.inc
|
||||||
EXTRA_OECONF_PATHS = " \
|
EXTRA_OECONF_PATHS = " \
|
||||||
--with-local-prefix=${STAGING_DIR_TARGET}${prefix} \
|
--with-local-prefix=${STAGING_DIR_TARGET}${prefix} \
|
||||||
--with-gxx-include-dir=${includedir}/c++/"
|
--with-gxx-include-dir=${includedir}/c++/"
|
||||||
|
|
||||||
|
RUNTIMETARGET = "libgcc libssp libstdc++-v3"
|
||||||
|
# ?
|
||||||
|
# libiberty
|
||||||
|
# libmudflap
|
||||||
|
# libgfortran
|
||||||
|
|
||||||
|
do_configure () {
|
||||||
|
cp ${CROSS_DIR}/include/gcc-build-internal/* ${S}/gcc
|
||||||
|
for d in ${RUNTIMETARGET}; do
|
||||||
|
echo "Configuring $d"
|
||||||
|
mkdir -p ${B}/$d/
|
||||||
|
cd ${B}/$d/
|
||||||
|
chmod a+x ${S}/$d/configure
|
||||||
|
${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF_PATHS}
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
do_compile () {
|
||||||
|
for d in ${RUNTIMETARGET}; do
|
||||||
|
cd ${B}/$d/
|
||||||
|
oe_runmake
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
do_install () {
|
||||||
|
for d in ${RUNTIMETARGET}; do
|
||||||
|
cd ${B}/$d/
|
||||||
|
oe_runmake 'DESTDIR=${D}' install
|
||||||
|
done
|
||||||
|
|
||||||
|
# Move libgcc_s into /lib
|
||||||
|
mkdir -p ${D}${base_libdir}
|
||||||
|
if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
|
||||||
|
mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
|
||||||
|
else
|
||||||
|
mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
INHIBIT_DEFAULT_DEPS = "1"
|
||||||
|
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
|
||||||
|
PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "nativesdk"
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@ FILES_libstdc++-dev = "\
|
||||||
${libdir}/libsupc++.la \
|
${libdir}/libsupc++.la \
|
||||||
${libdir}/libsupc++.a"
|
${libdir}/libsupc++.a"
|
||||||
|
|
||||||
FILES_libstdc++-precompile-dev = "${includedir}/c++/${BINV}/${TARGET_SYS}/bits/*.gch"
|
FILES_libstdc++-precompile-dev = "${includedir}/c++/${TARGET_SYS}/bits/*.gch"
|
||||||
|
|
||||||
FILES_libssp = "${libdir}/libssp.so.*"
|
FILES_libssp = "${libdir}/libssp.so.*"
|
||||||
FILES_libssp-dev = " \
|
FILES_libssp-dev = " \
|
||||||
|
@ -56,15 +56,3 @@ FILES_libmudflap-dev = "\
|
||||||
${libdir}/libmudflap*.a \
|
${libdir}/libmudflap*.a \
|
||||||
${libdir}/libmudflap*.la"
|
${libdir}/libmudflap*.la"
|
||||||
|
|
||||||
|
|
||||||
do_install () {
|
|
||||||
oe_runmake 'DESTDIR=${D}' install-target
|
|
||||||
|
|
||||||
# Move libgcc_s into /lib
|
|
||||||
mkdir -p ${D}${base_libdir}
|
|
||||||
if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
|
|
||||||
mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
|
|
||||||
else
|
|
||||||
mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
|
@ -8,39 +8,3 @@ SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
|
||||||
|
|
||||||
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
|
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
|
||||||
|
|
||||||
RUNTIMETARGET = "libgcc libssp libstdc++-v3"
|
|
||||||
# ?
|
|
||||||
# libiberty
|
|
||||||
# libmudflap
|
|
||||||
# libgfortran
|
|
||||||
|
|
||||||
do_configure () {
|
|
||||||
cp ${CROSS_DIR}/include/gcc-build-internal/* ${S}/gcc
|
|
||||||
for d in ${RUNTIMETARGET}; do
|
|
||||||
echo "Configuring $d"
|
|
||||||
mkdir -p ${B}/$d/
|
|
||||||
cd ${B}/$d/
|
|
||||||
chmod a+x ${S}/$d/configure
|
|
||||||
${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF_PATHS}
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
do_compile () {
|
|
||||||
for d in ${RUNTIMETARGET}; do
|
|
||||||
cd ${B}/$d/
|
|
||||||
oe_runmake
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
do_install () {
|
|
||||||
for d in ${RUNTIMETARGET}; do
|
|
||||||
cd ${B}/$d/
|
|
||||||
oe_runmake 'DESTDIR=${D}' install
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
INHIBIT_DEFAULT_DEPS = "1"
|
|
||||||
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
|
|
||||||
PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
|
|
||||||
|
|
||||||
BBCLASSEXTEND = "nativesdk"
|
|
||||||
|
|
Loading…
Reference in New Issue