diff options
| author | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-10-31 16:50:07 +0100 |
|---|---|---|
| committer | Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> | 2010-10-31 16:50:07 +0100 |
| commit | ae27f711023d95715eb8409e4d741973cd3a244e (patch) | |
| tree | 2876bb9c1a3f7aaadd6b43b80256af6fe3dd9c79 | |
| parent | 5ddca154bb0db0badebf0e96d8c1c511144e8274 (diff) | |
| download | crosstool-ng-ae27f711023d95715eb8409e4d741973cd3a244e.tar.gz crosstool-ng-ae27f711023d95715eb8409e4d741973cd3a244e.tar.bz2 crosstool-ng-ae27f711023d95715eb8409e4d741973cd3a244e.zip | |
scripts: do not provide to-sysroot include symlink
Do not provide the PREFIX/TUPLE/include -> SYSROOT/usr/include symlink,
and let gcc install its dependable C++ headers were it sees fit to
install them.
See the test by Anthony (by the end of the messages):
http://sourceware.org/ml/crossgcc/2010-10/msg00129.html
http://sourceware.org/ml/crossgcc/2010-10/msg00134.html
See also the comment by Arnaud:
http://sourceware.org/ml/crossgcc/2010-10/msg00157.html
Reported-by: Anthony Foiani <anthony.foiani@gmail.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
| -rw-r--r-- | scripts/build/internals.sh | 3 | ||||
| -rw-r--r-- | scripts/crosstool-NG.sh.in | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/scripts/build/internals.sh b/scripts/build/internals.sh index eae1123f..ca284a0f 100644 --- a/scripts/build/internals.sh +++ b/scripts/build/internals.sh @@ -155,10 +155,9 @@ do_finish() { CT_DoExecLog ALL rm -f "${d}/lib64" done - # Also remove the include/ and lib/ symlinks out-side of sysroot + # Also remove the lib/ symlink out-side of sysroot if [ "${CT_USE_SYSROOT}" = "y" ]; then CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/${CT_TARGET}/lib" - CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/${CT_TARGET}/include" fi CT_EndStep diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index 9ea76648..445f0f6e 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -324,8 +324,6 @@ if [ -z "${CT_RESTART}" ]; then if [ "${CT_USE_SYSROOT}" = "y" ]; then # Prevent gcc from installing its libraries outside of the sys-root CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/lib" "${CT_PREFIX_DIR}/${CT_TARGET}/lib" - # Prevent libc from installing its headers outside of the sysroot - CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sys-root/usr/include" "${CT_PREFIX_DIR}/${CT_TARGET}/include" fi # Since we're *not* multilib on the target side, we want all the |