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

diff --git a/packages/gcc/gcc-cross.inc b/packages/gcc/gcc-cross.inc
index 5664227..3fa6f61 100644 (file)
--- a/packages/gcc/gcc-cross.inc
+++ b/packages/gcc/gcc-cross.inc
@@ -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"

diff --git a/packages/gcc/gcc-paths-cross.inc b/packages/gcc/gcc-paths-cross.inc
deleted file mode 100644 (file)
index 3c08b18..0000000
--- a/packages/gcc/gcc-paths-cross.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-# 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}"