diff options
| -rw-r--r-- | classes/cross.bbclass | 8 | ||||
| -rw-r--r-- | recipes/gcc/gcc-cross.inc | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/classes/cross.bbclass b/classes/cross.bbclass index 9a3d39cb49..ad8b847213 100644 --- a/classes/cross.bbclass +++ b/classes/cross.bbclass @@ -32,6 +32,14 @@ LDFLAGS_build-darwin = "-L${STAGING_LIBDIR_NATIVE}" TOOLCHAIN_OPTIONS = "" +# Path mangling needed by the cross packaging +# Note that we use := here to ensure that libdir and includedir are +# target paths, not CROSS_DIR paths. +target_libdir := "${libdir}" +target_includedir := "${includedir}" +target_base_libdir := "${base_libdir}" +target_prefix := "${prefix}" + # Overrides for paths prefix = "${CROSS_DIR}" base_prefix = "${prefix}" diff --git a/recipes/gcc/gcc-cross.inc b/recipes/gcc/gcc-cross.inc index 3485824b8a..19dc550319 100644 --- a/recipes/gcc/gcc-cross.inc +++ b/recipes/gcc/gcc-cross.inc @@ -1,12 +1,3 @@ -# Path mangling needed by the cross packaging -# Note that we use := here, and require that this is included at the correct -# point (before inheriting cross) to ensure that libdir and includedir are -# target paths, not CROSS_DIR paths. -target_libdir := "${libdir}" -target_includedir := "${includedir}" -target_base_libdir := "${base_libdir}" -target_prefix := "${prefix}" - inherit cross DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc" |