real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Fixes --with-system-premake5, fixes #6710, refs 782a77f106.

Browse Source 
Based on fix by sera, tested on Manjaro 22.

This was SVN commit r27555.
This commit is contained in:
Nicolas Auvray 2023-02-20 15:06:39 +00:00
parent 4355c8675b
commit c05a6e81aa
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/workspaces/update-workspaces.sh
View File

@ -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"