mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-16 09:12:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix up for new buildsystem

Browse Source
This commit is contained in:
John-Mark Bell 2014-11-16 10:35:28 +00:00
parent 71d016aba5
commit 15f88ea1c3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Docs/env.sh
View File

@ -14,7 +14,7 @@
# parameters
if [ "x${TARGET_ABI}" = "x" ]; then
TARGET_ABI=$(uname -s)
TARGET_ABI=$(cc -dumpmachine)
fi
if [ "x${TARGET_WORKSPACE}" = "x" ]; then
@ -34,7 +34,7 @@ if [ "x${NETSURF_GTK_MAJOR}" = "x" ]; then
fi
# The host system doing the building
HOST_ABI=$(uname -s)
HOST_ABI=$(cc -dumpmachine)
# setup environment
echo "HOST_ABI=${HOST_ABI}"
@ -58,16 +58,16 @@ NS_INTERNAL_LIBS="buildsystem libwapcaplet libparserutils libhubbub libdom libcs
NS_BROWSER="netsurf"
# add target specific libraries
if [ "x${TARGET_ABI}" = "xHaiku" ]; then
if [ "x${TARGET_ABI}" = "xi586-pc-haiku" ]; then
# tools required to build the browser
NS_TOOLS=""
NS_FRONTEND_LIBS=""
elif [ "x${TARGET_ABI}" = "xDarwin" ]; then
elif [ "x${TARGET_ABI}" = "xi686-apple-darwin11" ]; then
# tools required to build the browser
NS_TOOLS=""
# libraries required for the Darwin target abi
NS_FRONTEND_LIBS="libsvgtiny libnsfb"
elif [ "x${TARGET_ABI}" = "xriscos" ]; then
elif [ "x${TARGET_ABI}" = "xarm-unknown-riscos" ]; then
# tools required to build the browser
NS_TOOLS="nsgenbind"
# libraries required for the risc os target abi
@ -198,7 +198,7 @@ ns-make-libs()
{
for REPO in $(echo ${NS_INTERNAL_LIBS} ${NS_FRONTEND_LIBS} ${NS_TOOLS}); do
echo " MAKE: make -C ${REPO} $USE_CPUS $*"
make -C ${TARGET_WORKSPACE}/${REPO} TARGET=${TARGET_ABI} $USE_CPUS $*
make -C ${TARGET_WORKSPACE}/${REPO} BUILD=${TARGET_ABI} $USE_CPUS $*
done
}
@ -206,7 +206,7 @@ ns-make-libs()
ns-make-libnsfb()
{
echo " MAKE: make -C libnsfb $USE_CPUS $*"
make -C ${TARGET_WORKSPACE}/libnsfb TARGET=${TARGET_ABI} $USE_CPUS $*
make -C ${TARGET_WORKSPACE}/libnsfb BUILD=${TARGET_ABI} $USE_CPUS $*
}
# pulls all repos and makes and installs the libraries and tools