From d90263f4c4ada090552de57e766833a921fa86da Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sun, 25 Sep 2022 13:19:48 +0200 Subject: [PATCH] No idea where these changes came from, but they break local Windows builds 100% --- scripts/configure_firestorm.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/scripts/configure_firestorm.sh b/scripts/configure_firestorm.sh index ae53d4eaa2..cfc5c04309 100755 --- a/scripts/configure_firestorm.sh +++ b/scripts/configure_firestorm.sh @@ -357,16 +357,13 @@ then echo "Setting environment variables for Visual Studio..." if [ "$OSTYPE" = "cygwin" ] ; then - # load autobuild provided shell functions and variables - eval "$("$AUTOBUILD_EXEC" source_environment)" - # vsvars is needed for determing path to VS runtime redist files in Copy3rdPartyLibs.cmake - load_vsvars - else - # load autobuild provided shell functions and variables - eval "$("$AUTOBUILD" source_environment)" - # vsvars is needed for determing path to VS runtime redist files in Copy3rdPartyLibs.cmake - load_vsvars + export AUTOBUILD_EXEC="$(cygpath -u $AUTOBUILD)" fi + + # load autobuild provided shell functions and variables + eval "$("$AUTOBUILD_EXEC" source_environment)" + # vsvars is needed for determing path to VS runtime redist files in Copy3rdPartyLibs.cmake + load_vsvars fi if [ -z "$AUTOBUILD_VARIABLES_FILE" ]