binutils/gcc-crosssdk: Fix hardcoded path layout assumptions for cross toolchains
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
c50e585588
commit
baf69e6a92
|
@ -4,9 +4,9 @@ inherit crosssdk
|
||||||
|
|
||||||
PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
|
PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r3"
|
||||||
|
|
||||||
do_configure_prepend () {
|
do_configure_prepend () {
|
||||||
sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATH}/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
|
sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -50,6 +50,7 @@ ARCH_FLAGS_FOR_TARGET = "${TARGET_CC_ARCH}"
|
||||||
EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'"
|
EXTRA_OEMAKE += "ARCH_FLAGS_FOR_TARGET='${ARCH_FLAGS_FOR_TARGET}'"
|
||||||
|
|
||||||
SYSTEMHEADERS = "${target_includedir}"
|
SYSTEMHEADERS = "${target_includedir}"
|
||||||
|
SYSTEMLIBS = "${target_base_libdir}/"
|
||||||
SYSTEMLIBS1 = "${target_libdir}/"
|
SYSTEMLIBS1 = "${target_libdir}/"
|
||||||
|
|
||||||
do_configure () {
|
do_configure () {
|
||||||
|
@ -86,6 +87,9 @@ do_configure () {
|
||||||
echo "#ifndef STANDARD_INCLUDE_DIR" >> ${S}/gcc/defaults.h.new
|
echo "#ifndef STANDARD_INCLUDE_DIR" >> ${S}/gcc/defaults.h.new
|
||||||
echo "#define STANDARD_INCLUDE_DIR \"${SYSTEMHEADERS}\"" >> ${S}/gcc/defaults.h.new
|
echo "#define STANDARD_INCLUDE_DIR \"${SYSTEMHEADERS}\"" >> ${S}/gcc/defaults.h.new
|
||||||
echo "#endif" >> ${S}/gcc/defaults.h.new
|
echo "#endif" >> ${S}/gcc/defaults.h.new
|
||||||
|
echo "#ifndef STANDARD_STARTFILE_PREFIX_1" >> ${S}/gcc/defaults.h.new
|
||||||
|
echo "#define STANDARD_STARTFILE_PREFIX_1 \"${SYSTEMLIBS}\"" >> ${S}/gcc/defaults.h.new
|
||||||
|
echo "#endif" >> ${S}/gcc/defaults.h.new
|
||||||
echo "#ifndef STANDARD_STARTFILE_PREFIX_2" >> ${S}/gcc/defaults.h.new
|
echo "#ifndef STANDARD_STARTFILE_PREFIX_2" >> ${S}/gcc/defaults.h.new
|
||||||
echo "#define STANDARD_STARTFILE_PREFIX_2 \"${SYSTEMLIBS1}\"" >> ${S}/gcc/defaults.h.new
|
echo "#define STANDARD_STARTFILE_PREFIX_2 \"${SYSTEMLIBS1}\"" >> ${S}/gcc/defaults.h.new
|
||||||
echo "#endif" >> ${S}/gcc/defaults.h.new
|
echo "#endif" >> ${S}/gcc/defaults.h.new
|
||||||
|
|
|
@ -11,6 +11,7 @@ DEPENDS += "gmp-nativesdk mpfr-nativesdk"
|
||||||
RDEPENDS_${PN} += "mpfr-nativesdk"
|
RDEPENDS_${PN} += "mpfr-nativesdk"
|
||||||
|
|
||||||
SYSTEMHEADERS = "/usr/include"
|
SYSTEMHEADERS = "/usr/include"
|
||||||
|
SYSTEMLIBS = "/lib/"
|
||||||
SYSTEMLIBS1 = "/usr/lib/"
|
SYSTEMLIBS1 = "/usr/lib/"
|
||||||
|
|
||||||
EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
|
EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
inherit crosssdk
|
inherit crosssdk
|
||||||
|
|
||||||
SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
|
SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
|
||||||
|
SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
|
||||||
SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
|
SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
|
||||||
|
|
||||||
DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native"
|
DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
inherit crosssdk
|
inherit crosssdk
|
||||||
|
|
||||||
SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
|
SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
|
||||||
|
SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
|
||||||
SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
|
SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
|
||||||
|
|
||||||
DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native"
|
DEPENDS = "virtual/${TARGET_PREFIX}binutils-crosssdk gettext-native"
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
require gcc-cross-intermediate_${PV}.bb
|
require gcc-cross-intermediate_${PV}.bb
|
||||||
require gcc-crosssdk-intermediate.inc
|
require gcc-crosssdk-intermediate.inc
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
inherit crosssdk
|
inherit crosssdk
|
||||||
|
|
||||||
SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
|
SYSTEMHEADERS = "${SDKPATHNATIVE}${prefix_nativesdk}/include"
|
||||||
|
SYSTEMLIBS = "${SDKPATHNATIVE}${base_libdir_nativesdk}/"
|
||||||
SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
|
SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/"
|
||||||
|
|
||||||
GCCMULTILIB = "--disable-multilib"
|
GCCMULTILIB = "--disable-multilib"
|
||||||
|
@ -10,6 +11,6 @@ PROVIDES = "virtual/${TARGET_PREFIX}gcc-crosssdk virtual/${TARGET_PREFIX}g++-cro
|
||||||
|
|
||||||
do_configure_prepend () {
|
do_configure_prepend () {
|
||||||
# Change the default dynamic linker path to the one in the SDK
|
# Change the default dynamic linker path to the one in the SDK
|
||||||
sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib/#\1${SYSTEMLIBS1}#'
|
sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib/#\1${SYSTEMLIBS}#'
|
||||||
sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib64/#\1${SYSTEMLIBS1}#'
|
sed -i ${S}/gcc/config/*/linux*.h -e 's#\(GLIBC_DYNAMIC_LINKER.*\)/lib64/#\1${SYSTEMLIBS}#'
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue