perl: Do not unset AR for global scope
This commit is contained in:
parent
77bce9623a
commit
2b8b24fe09
@ -39,36 +39,38 @@ termux_step_post_get_source() {
|
|||||||
termux_step_configure() {
|
termux_step_configure() {
|
||||||
export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
|
export PATH=$PATH:$TERMUX_STANDALONE_TOOLCHAIN/bin
|
||||||
|
|
||||||
ORIG_AR=$AR; unset AR
|
|
||||||
ORIG_AS=$AS; unset AS
|
|
||||||
ORIG_CC=$CC; unset CC
|
|
||||||
ORIG_CXX=$CXX; unset CXX
|
|
||||||
ORIG_CPP=$CPP; unset CPP
|
|
||||||
ORIG_CFLAGS=$CFLAGS; unset CFLAGS
|
|
||||||
ORIG_CPPFLAGS=$CPPFLAGS; unset CPPFLAGS
|
|
||||||
ORIG_CXXFLAGS=$CXXFLAGS; unset CXXFLAGS
|
|
||||||
ORIG_LDFLAGS=$LDFLAGS; unset LDFLAGS
|
|
||||||
ORIG_RANLIB=$RANLIB; unset RANLIB
|
|
||||||
ORIG_LD=$LD; unset LD
|
|
||||||
|
|
||||||
# Since we specify $TERMUX_PREFIX/bin/sh below for the shell
|
# Since we specify $TERMUX_PREFIX/bin/sh below for the shell
|
||||||
# it will be run during the build, so temporarily (removed in
|
# it will be run during the build, so temporarily (removed in
|
||||||
# termux_step_post_make_install below) setup symlink:
|
# termux_step_post_make_install below) setup symlink:
|
||||||
rm -f $TERMUX_PREFIX/bin/sh
|
rm -f $TERMUX_PREFIX/bin/sh
|
||||||
ln -s /bin/sh $TERMUX_PREFIX/bin/sh
|
ln -s /bin/sh $TERMUX_PREFIX/bin/sh
|
||||||
|
|
||||||
cd $TERMUX_PKG_BUILDDIR
|
(
|
||||||
$TERMUX_PKG_SRCDIR/configure \
|
ORIG_AR=$AR; unset AR
|
||||||
--target=$TERMUX_HOST_PLATFORM \
|
ORIG_AS=$AS; unset AS
|
||||||
-Dosname=android \
|
ORIG_CC=$CC; unset CC
|
||||||
-Dsysroot=$TERMUX_STANDALONE_TOOLCHAIN/sysroot \
|
ORIG_CXX=$CXX; unset CXX
|
||||||
-Dprefix=$TERMUX_PREFIX \
|
ORIG_CPP=$CPP; unset CPP
|
||||||
-Dsh=$TERMUX_PREFIX/bin/sh \
|
ORIG_CFLAGS=$CFLAGS; unset CFLAGS
|
||||||
-Dcc="$ORIG_CC" \
|
ORIG_CPPFLAGS=$CPPFLAGS; unset CPPFLAGS
|
||||||
-Dld="$ORIG_CC -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" \
|
ORIG_CXXFLAGS=$CXXFLAGS; unset CXXFLAGS
|
||||||
-Dar="$ORIG_AR" \
|
ORIG_LDFLAGS=$LDFLAGS; unset LDFLAGS
|
||||||
-Duseshrplib \
|
ORIG_RANLIB=$RANLIB; unset RANLIB
|
||||||
-Dusethreads
|
ORIG_LD=$LD; unset LD
|
||||||
|
|
||||||
|
cd $TERMUX_PKG_BUILDDIR
|
||||||
|
$TERMUX_PKG_SRCDIR/configure \
|
||||||
|
--target=$TERMUX_HOST_PLATFORM \
|
||||||
|
-Dosname=android \
|
||||||
|
-Dsysroot=$TERMUX_STANDALONE_TOOLCHAIN/sysroot \
|
||||||
|
-Dprefix=$TERMUX_PREFIX \
|
||||||
|
-Dsh=$TERMUX_PREFIX/bin/sh \
|
||||||
|
-Dcc="$ORIG_CC" \
|
||||||
|
-Dld="$ORIG_CC -Wl,-rpath=$TERMUX_PREFIX/lib -Wl,--enable-new-dtags" \
|
||||||
|
-Dar="$ORIG_AR" \
|
||||||
|
-Duseshrplib \
|
||||||
|
-Dusethreads
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
termux_step_post_make_install() {
|
termux_step_post_make_install() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user