From c05a6e81aa03dbe4caf3c74227ea4daa509e56dd Mon Sep 17 00:00:00 2001 From: Itms Date: Mon, 20 Feb 2023 15:06:39 +0000 Subject: [PATCH] Fixes --with-system-premake5, fixes #6710, refs 782a77f106. Based on fix by sera, tested on Manjaro 22. This was SVN commit r27555. --- build/workspaces/update-workspaces.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/build/workspaces/update-workspaces.sh b/build/workspaces/update-workspaces.sh index 8e7ce4bf7d..25130099c1 100755 --- a/build/workspaces/update-workspaces.sh +++ b/build/workspaces/update-workspaces.sh @@ -104,10 +104,12 @@ fi # Now run premake to create the makefiles +cd ../premake premake_command="premake5" + if [ "$with_system_premake5" = "false" ]; then # Build bundled premake - cd ../premake/premake5 + cd premake5 PREMAKE_BUILD_DIR=build/gmake2.unix # BSD and OS X need different Makefiles case "`uname -s`" in @@ -123,13 +125,12 @@ if [ "$with_system_premake5" = "false" ]; then esac ${MAKE} -C $PREMAKE_BUILD_DIR ${JOBS} || die "Premake build failed" + cd .. premake_command="premake5/bin/release/premake5" fi echo -cd .. - # If we're in bash then make HOSTTYPE available to Premake, for primitive arch-detection export HOSTTYPE="$HOSTTYPE"