diff options
author | Steve Arnold <nerdboy@gentoo.org> | 2017-10-14 15:33:04 -0700 |
---|---|---|
committer | Steve Arnold <nerdboy@gentoo.org> | 2017-10-14 15:33:04 -0700 |
commit | 250707e426f3bd775d85671743df3053e6868c74 (patch) | |
tree | f9c16a88f2799cc1e55c6b80bd9373cbfcda9d0f | |
parent | sys-devel/crossdev: avr: disable pie, set default stage, make symlink (diff) | |
download | crossdev-250707e4.tar.gz crossdev-250707e4.tar.bz2 crossdev-250707e4.zip |
Revert "ROOT method for glibc."
This reverts commit d770cdb3feb397cedfdc36ac4b9f07f984152c86.
-rwxr-xr-x | crossdev | 10 |
1 files changed, 2 insertions, 8 deletions
@@ -1153,9 +1153,8 @@ emerge-wrapper --target ${CTARGET} --init || exit 1 ################# emerged_with_use() { - local pkg=$1 use=$2 alt - case $pkg in *lib*|musl) alt="/usr/${CTARGET}" ;; esac - grep -qs ${use} "${EPREFIX}"${alt}/var/db/pkg/cross-${CTARGET}/${pkg}-*/USE + local pkg=$1 use=$2 + grep -qs ${use} "${EPREFIX}"/var/db/pkg/cross-${CTARGET}/${pkg}-*/USE } set_eopts_on_pkg_status() { emerged_with_use "$@" \ @@ -1249,9 +1248,6 @@ if ! ex_fast ; then # care about at this point -- we aren't compiling yet USE="${LUSE} ${USE}" \ CROSSCOMPILE_OPTS="headers-only" \ - ROOT="${EPREFIX}"/usr/${CTARGET} \ - ALT_BUILD_HEADERS="${ROOT}"/usr/include \ - EPREFIX="/" \ EOPTS="${EOPTS} --nodeps" \ doemerge ${LPKG} ${LPKG}-headers fi @@ -1279,8 +1275,6 @@ if ! ex_fast ; then set_eopts_on_pkg_status ${LPKG} crosscompile_opts_headers-only USE="${LUSE} ${USE}" \ - ROOT=${EPREFIX}/usr/${CTARGET} \ - EPREFIX="/" \ CROSSCOMPILE_OPTS="" \ doemerge ${LPKG} fi |