diff --git a/Packaging/OpenDingux/build.sh b/Packaging/OpenDingux/build.sh index 84702e459..e89c2f7ac 100755 --- a/Packaging/OpenDingux/build.sh +++ b/Packaging/OpenDingux/build.sh @@ -33,13 +33,20 @@ if [[ $TARGET == gkd350h ]]; then # Use the rg350 buildroot for gkd350h because gkd350h buildroot is not open-source. BUILDROOT_TARGET=rg350 fi -BUILDROOT="${BUILDROOT:-$HOME/devilutionx-buildroots/$BUILDROOT_TARGET}" + +# If a TOOLCHAIN environment variable is set, just use that. +if [[ -z ${TOOLCHAIN:-} ]]; then + BUILDROOT="${BUILDROOT:-$HOME/devilutionx-buildroots/$BUILDROOT_TARGET}" + TOOLCHAIN="${BUILDROOT}/output/host" +fi main() { >&2 echo "Building for target ${TARGET} in ${BUILD_DIR}" set -x - prepare_buildroot - make_buildroot + if [[ -n ${BUILDROOT:-} ]]; then + prepare_buildroot + make_buildroot + fi build package_opk } @@ -70,7 +77,7 @@ build() { cd "$BUILD_DIR" rm -f CMakeCache.txt cmake .. -DBINARY_RELEASE=ON "-DTARGET_PLATFORM=$TARGET" \ - -DCMAKE_TOOLCHAIN_FILE="$BUILDROOT/output/host/usr/share/buildroot/toolchainfile.cmake" + -DCMAKE_TOOLCHAIN_FILE="${TOOLCHAIN}/usr/share/buildroot/toolchainfile.cmake" make -j $(getconf _NPROCESSORS_ONLN) cd - }