[oe-commits] org.oe.dev gcc-cross.inc: Merge in gcc-paths-cross.inc

[rpurdie commit]

gcc-cross.inc: Merge in gcc-paths-cross.inc

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: bd3f1f45a747e00cc0eacf1573d952ab9a46fc2a
ViewMTN: http://monotone.openembedded.org/revision/info/bd3f1f45a747e00cc0eacf1573d952ab9a46fc2a
Files:
1
packages/gcc/gcc-paths-cross.inc
packages/gcc/gcc-cross.inc
Diffs:

#
# mt diff -r8fb4dfc6391cf0974d28e10236a7d28aaa261b7a -rbd3f1f45a747e00cc0eacf1573d952ab9a46fc2a
#
#
#
# delete "packages/gcc/gcc-paths-cross.inc"
# 
# patch "packages/gcc/gcc-cross.inc"
#  from [5f1ef87e018b6d079617470b7b94e92a69839d00]
#    to [276d65d4414d29aa71563759d2be0e6dce921d9c]
#
============================================================
--- packages/gcc/gcc-cross.inc	5f1ef87e018b6d079617470b7b94e92a69839d00
+++ packages/gcc/gcc-cross.inc	276d65d4414d29aa71563759d2be0e6dce921d9c
@@ -1,5 +1,11 @@
-# path mangling, needed by the cross packaging
-require gcc-paths-cross.inc
+# 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}"
+
 inherit cross
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"