diff options
| author | Dan McGee <dan@archlinux.org> | 2008-12-07 22:12:17 -0600 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-12-07 22:12:17 -0600 |
| commit | bd628274cc8db81704860e69894fcd217c2068d0 (patch) | |
| tree | 0ca59deff11d9eff700494e727604903b60352b8 /scripts | |
| parent | 9ae7eb1292a42eb568fd982f32d3dca5b9794a2d (diff) | |
| parent | 78cf32e194a1a58c6a7ee3d1c10623e668be71d6 (diff) | |
| download | pacman-bd628274cc8db81704860e69894fcd217c2068d0.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 179746d2..94cb942e 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -673,6 +673,8 @@ run_build() { # ensure all necessary build variables are exported export CFLAGS CXXFLAGS MAKEFLAGS CHOST + # save our shell options so build() can't override what we need + local shellopts=$(shopt -p) local ret=0 if [ "$LOGGING" = "1" ]; then @@ -693,6 +695,8 @@ run_build() { else build 2>&1 || ret=$? fi + # reset our shell options + eval "$shellopts" if [ $ret -gt 0 ]; then error "$(gettext "Build Failed.")" |