Incorporate NASM into this toolchain.
This commit is contained in:
parent
7529ec4918
commit
5c901f2d31
|
@ -38,6 +38,11 @@ MINGWTAG="v7.0.0"
|
||||||
MINGWNTV="0x601"
|
MINGWNTV="0x601"
|
||||||
MINGWVCS="https://github.com/mirror/mingw-w64.git"
|
MINGWVCS="https://github.com/mirror/mingw-w64.git"
|
||||||
|
|
||||||
|
# NASM Settings
|
||||||
|
NASMDIR="${SRCDIR}/nasm"
|
||||||
|
NASMTAG="nasm-2.15.05"
|
||||||
|
NASMVCS="https://github.com/netwide-assembler/nasm.git"
|
||||||
|
|
||||||
# Ninja Settings
|
# Ninja Settings
|
||||||
NINJADIR="${SRCDIR}/ninja"
|
NINJADIR="${SRCDIR}/ninja"
|
||||||
NINJATAG="v1.10.0"
|
NINJATAG="v1.10.0"
|
||||||
|
@ -494,6 +499,30 @@ mingw_fetch()
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# This function compiles and installs NASM
|
||||||
|
nasm_build()
|
||||||
|
{
|
||||||
|
cd ${NASMDIR}
|
||||||
|
./autogen.sh
|
||||||
|
./configure
|
||||||
|
make -j${CORES}
|
||||||
|
install nasm ndisasm ${BINDIR}/bin/
|
||||||
|
cd ${WRKDIR}
|
||||||
|
}
|
||||||
|
|
||||||
|
# This function downloads NASM from VCS
|
||||||
|
nasm_fetch()
|
||||||
|
{
|
||||||
|
if [ ! -d ${NASMDIR} ]; then
|
||||||
|
echo ">>> Downloading NASM ..."
|
||||||
|
git clone ${NASMVCS} ${NASMDIR}
|
||||||
|
cd ${NASMDIR}
|
||||||
|
git checkout tags/${NASMTAG}
|
||||||
|
apply_patches ${NASMDIR##*/} ${NASMTAG##*-}
|
||||||
|
cd ${WRKDIR}
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# This function compiles and installs NINJA
|
# This function compiles and installs NINJA
|
||||||
ninja_build()
|
ninja_build()
|
||||||
{
|
{
|
||||||
|
@ -610,6 +639,12 @@ llvm_fetch
|
||||||
# Build and install LLVM
|
# Build and install LLVM
|
||||||
llvm_build
|
llvm_build
|
||||||
|
|
||||||
|
# Download NASM
|
||||||
|
nasm_fetch
|
||||||
|
|
||||||
|
# Build and install NASM
|
||||||
|
nasm_build
|
||||||
|
|
||||||
# Download Mingw-W64
|
# Download Mingw-W64
|
||||||
mingw_fetch
|
mingw_fetch
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue