Commit d97db71d authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

Use 'sysroot' rather than 'sys-root' for the sysroot/staging_dir 



As pointed out on the list, using sysroot rather than sys-root is less
confusing, as this is how it is referred to in the GCC manual.

So rather than changing BR, patch ct-ng to use sysroot instead.
The next ct-ng release will use 'sysroot' as well by default.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 30366440

package/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ endif 


REAL_GNU_TARGET_NAME=$(ARCH)-unknown-linux-$(LIBC)$(ABI)



STAGING_DIR=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sys-root

STAGING_DIR=$(HOST_DIR)/usr/$(REAL_GNU_TARGET_NAME)/sysroot



ifeq ($(BR2_OPTIMIZE_0),y)

TARGET_OPTIMIZATION+=-O0

toolchain/toolchain-crosstool-ng/003-use-sysroot.patch

0 → 100644
+35 −0
Original line number Diff line number Diff line 
ct-ng: use 'sysroot' rather than 'sys-root' for sysroot directory



The sysroot directory name is arbitrary, but 'sysroot' matches the GCC

documentation.



Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

---

 scripts/crosstool-NG.sh.in |    6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)



Index: crosstool-ng-1.8.0/scripts/crosstool-NG.sh.in

===================================================================

--- crosstool-ng-1.8.0.orig/scripts/crosstool-NG.sh.in

+++ crosstool-ng-1.8.0/scripts/crosstool-NG.sh.in

@@ -274,7 +274,7 @@ esac

 if [ -z "${CT_RESTART}" ]; then

     # Arrange paths depending on wether we use sys-root or not.

     if [ "${CT_USE_SYSROOT}" = "y" ]; then

-        CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/sys-root"

+        CT_SYSROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/sysroot"

         CT_DEBUGROOT_DIR="${CT_PREFIX_DIR}/${CT_TARGET}/${CT_SYSROOT_DIR_PREFIX}/debug-root"

         CT_HEADERS_DIR="${CT_SYSROOT_DIR}/usr/include"

         BINUTILS_SYSROOT_ARG="--with-sysroot=${CT_SYSROOT_DIR}"

@@ -315,9 +315,9 @@ 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"

+        CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sysroot/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"

+        CT_DoExecLog ALL ln -sf "./${CT_SYSROOT_DIR_PREFIX}/sysroot/usr/include" "${CT_PREFIX_DIR}/${CT_TARGET}/include"

     fi

 

     # Now, in case we're 64 bits, just have lib64/ be a symlink to lib/