From 654d26c38d871fdb91f7d79d7da1f1f8c1067e01 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 16 Mar 2008 00:36:09 +0000 Subject: gcc-cross.inc: Merge in gcc-paths-cross.inc --- packages/gcc/gcc-cross.inc | 10 ++++++++-- packages/gcc/gcc-paths-cross.inc | 7 ------- 2 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 packages/gcc/gcc-paths-cross.inc (limited to 'packages/gcc') diff --git a/packages/gcc/gcc-cross.inc b/packages/gcc/gcc-cross.inc index 566422769d..3fa6f61f0d 100644 --- 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 index 3c08b1805d..0000000000 --- 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}" -- cgit v1.2.3