mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
gcc-4.5.1: share work directories
Fix configure and Makefile to read the defaults.h and t-oe from ${B},
so that the ${S} can be shared.
(From OE-Core rev: d8c6f6e01421455db30eeb4b0882720874dcb31b)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
3e08c1f078
commit
e4f43aa5df
@@ -57,6 +57,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
|
|||||||
file://gcc-poison-parameters.patch \
|
file://gcc-poison-parameters.patch \
|
||||||
file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
|
file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
|
||||||
file://COLLECT_GCC_OPTIONS.patch \
|
file://COLLECT_GCC_OPTIONS.patch \
|
||||||
|
file://use-defaults.h-and-t-oe-in-B.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
|
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
|
||||||
|
|||||||
@@ -0,0 +1,57 @@
|
|||||||
|
Upstream-Status: Pending
|
||||||
|
|
||||||
|
Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that
|
||||||
|
the source can be shared between gcc-cross-initial,
|
||||||
|
gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
|
||||||
|
---
|
||||||
|
gcc/Makefile.in | 2 +-
|
||||||
|
gcc/configure | 4 ++--
|
||||||
|
gcc/configure.ac | 4 ++--
|
||||||
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
|
||||||
|
index d91f93a..03ee2bd 100644
|
||||||
|
--- a/gcc/Makefile.in
|
||||||
|
+++ b/gcc/Makefile.in
|
||||||
|
@@ -461,7 +461,7 @@ LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ]
|
||||||
|
TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
|
||||||
|
|
||||||
|
xmake_file=@xmake_file@
|
||||||
|
-tmake_file=@tmake_file@
|
||||||
|
+tmake_file=@tmake_file@ ./t-oe
|
||||||
|
TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@
|
||||||
|
TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
|
||||||
|
TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
|
||||||
|
diff --git a/gcc/configure b/gcc/configure
|
||||||
|
index f440fa2..dafb0c1 100755
|
||||||
|
--- a/gcc/configure
|
||||||
|
+++ b/gcc/configure
|
||||||
|
@@ -10838,8 +10838,8 @@ for f in $tm_file; do
|
||||||
|
tm_include_list="${tm_include_list} $f"
|
||||||
|
;;
|
||||||
|
defaults.h )
|
||||||
|
- tm_file_list="${tm_file_list} \$(srcdir)/$f"
|
||||||
|
- tm_include_list="${tm_include_list} $f"
|
||||||
|
+ tm_file_list="${tm_file_list} ./$f"
|
||||||
|
+ tm_include_list="${tm_include_list} ./$f"
|
||||||
|
;;
|
||||||
|
* )
|
||||||
|
tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
|
||||||
|
diff --git a/gcc/configure.ac b/gcc/configure.ac
|
||||||
|
index d003091..ba422e6 100644
|
||||||
|
--- a/gcc/configure.ac
|
||||||
|
+++ b/gcc/configure.ac
|
||||||
|
@@ -1652,8 +1652,8 @@ for f in $tm_file; do
|
||||||
|
tm_include_list="${tm_include_list} $f"
|
||||||
|
;;
|
||||||
|
defaults.h )
|
||||||
|
- tm_file_list="${tm_file_list} \$(srcdir)/$f"
|
||||||
|
- tm_include_list="${tm_include_list} $f"
|
||||||
|
+ tm_file_list="${tm_file_list} ./$f"
|
||||||
|
+ tm_include_list="${tm_include_list} ./$f"
|
||||||
|
;;
|
||||||
|
* )
|
||||||
|
tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
|
||||||
|
--
|
||||||
|
1.7.1
|
||||||
|
|
||||||
Reference in New Issue
Block a user