diff options
| author | Phillip Smith <fukawi2@gmail.com> | 2013-04-30 09:10:08 +1000 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-05-29 14:08:03 +1000 |
| commit | 5bcc058d4217a3e843e9adfbe0d8882ddf0f31b1 (patch) | |
| tree | b44bc450b33162b535a704fb9636f509df7075ae /scripts/makepkg.sh.in | |
| parent | a975523fb97fdb65245f3d3a4e0c581c9dbeef3f (diff) | |
| download | pacman-5bcc058d4217a3e843e9adfbe0d8882ddf0f31b1.tar.xz | |
makepkg: add support for CARCH environment var
Add support for overriding configuration in /etc/makepkg.conf and
~/.makepkg.conf by setting the environment variable CARCH similar to
how SRCDEST and PKGDEST behave.
Fixes FS#35030.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts/makepkg.sh.in')
| -rw-r--r-- | scripts/makepkg.sh.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index fca2f2e3..1d737d07 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2638,6 +2638,7 @@ trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' E [[ -n ${SRCEXT} ]] && _SRCEXT=${SRCEXT} [[ -n ${GPGKEY} ]] && _GPGKEY=${GPGKEY} [[ -n ${PACKAGER} ]] && _PACKAGER=${PACKAGER} +[[ -n ${CARCH} ]] && _CARCH=${CARCH} # default config is makepkg.conf MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf} @@ -2737,6 +2738,7 @@ PKGEXT=${_PKGEXT:-$PKGEXT} SRCEXT=${_SRCEXT:-$SRCEXT} GPGKEY=${_GPGKEY:-$GPGKEY} PACKAGER=${_PACKAGER:-$PACKAGER} +CARCH=${_CARCH:-$CARCH} if (( ! INFAKEROOT )); then if (( EUID == 0 && ! ASROOT )); then |