diff options
| -rwxr-xr-x | wrappers/emerge-wrapper | 10 | ||||
| l--------- | wrappers/etc/make.globals | 1 | ||||
| -rw-r--r-- | wrappers/etc/portage/make.conf (renamed from wrappers/etc/make.conf) | 0 |
3 files changed, 8 insertions, 3 deletions
diff --git a/wrappers/emerge-wrapper b/wrappers/emerge-wrapper index d900784..20b32ff 100755 --- a/wrappers/emerge-wrapper +++ b/wrappers/emerge-wrapper @@ -35,9 +35,15 @@ cross_wrap_etc() setup_warning=false cp -a "${PREFIX}"/share/crossdev/etc ${SYSROOT}/ || return 1 - ln -sf /etc/make.globals ${SYSROOT}/etc/make.globals || return 1 + local f + for f in /usr/share/portage/config/make.globals /etc/{portage/,}make.globals ; do + if [[ -e ${f} ]] ; then + ln -sf ${f} "${SYSROOT}"/etc/portage/make.globals || return 1 + break + fi + done - local conf=${SYSROOT}/etc/make.conf + local conf=${SYSROOT}/etc/portage/make.conf # Re-use existing CHOST->portage ARCH mapping code ARCH=$( diff --git a/wrappers/etc/make.globals b/wrappers/etc/make.globals deleted file mode 120000 index 213ed49..0000000 --- a/wrappers/etc/make.globals +++ /dev/null @@ -1 +0,0 @@ -/etc/make.globals
\ No newline at end of file diff --git a/wrappers/etc/make.conf b/wrappers/etc/portage/make.conf index b9f29d9..b9f29d9 100644 --- a/wrappers/etc/make.conf +++ b/wrappers/etc/portage/make.conf |