From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Wed, 18 May 2016 14:24:22 +0000 (-0400)
Subject: picolisp: Minor update and buildable using clang
X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/commitdiff_plain/bb5cfa8c9d55ae9ba0ea097426d1ae3a4d4174a0

picolisp: Minor update and buildable using clang
---

diff --git a/build-package.sh b/build-package.sh
index 1cc958aa..bacee8b1 100755
--- a/build-package.sh
+++ b/build-package.sh
@@ -80,7 +80,7 @@ if [ "$TERMUX_CLANG" = "" ]; then
 	export CXX=$TERMUX_HOST_PLATFORM-g++
 	_SPECSFLAG="-specs=$TERMUX_SCRIPTDIR/termux.spec"
 else
-	export AS=${TERMUX_HOST_PLATFORM}-clang
+	export AS=${TERMUX_HOST_PLATFORM}-gcc
 	export CC=$TERMUX_HOST_PLATFORM-clang
 	export CXX=$TERMUX_HOST_PLATFORM-clang++
 	# TODO: clang does not have specs file, how to ensure pie
diff --git a/packages/picolisp/build.sh b/packages/picolisp/build.sh
index 2ddb9fa2..83e641b7 100644
--- a/packages/picolisp/build.sh
+++ b/packages/picolisp/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Lisp interpreter and application server framework"
 TERMUX_PKG_DEPENDS="libcrypt, openssl"
 _PICOLISP_YEAR=16
 _PICOLISP_MONTH=5
-_PICOLISP_DAY=8
+_PICOLISP_DAY=13
 TERMUX_PKG_VERSION=${_PICOLISP_YEAR}.${_PICOLISP_MONTH}.${_PICOLISP_DAY}
 TERMUX_PKG_SRCURL=http://software-lab.de/picoLisp.tgz
 TERMUX_PKG_FOLDERNAME=picoLisp
@@ -34,10 +34,10 @@ termux_step_make_install () {
 	cd $TERMUX_PKG_SRCDIR/
 
 	if [ $TERMUX_ARCH_BITS = "64" ]; then
-		$CC -pie -o ../bin/picolisp -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.s -lc -lm -ldl
+		$AS -pie -o ../bin/picolisp -rdynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.base.s -lc -lm -ldl
 		chmod +x ../bin/picolisp
-		$CC -pie -o ../lib/ext -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.s
-		$CC --pie -o ../lib/ht -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.s
+		$AS -pie -o ../lib/ext -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ext.s
+		$AS --pie -o ../lib/ht -shared -export-dynamic ${TERMUX_PKG_EXTRA_MAKE_ARGS}.ht.s
 	fi
 
 	mkdir -p $TERMUX_PREFIX/share/man/man1