From ba1f4584e2295998c12b3e120a9274926b4381e2 Mon Sep 17 00:00:00 2001 From: Colin Finck Date: Tue, 26 May 2020 23:10:40 +0200 Subject: [PATCH] [ROSBE-WINDOWS] Revert the Ninja build step changes. They only seem to work under Unix, but not for Windows/MinGW. Shouldn't change anything anyway, change was just for consistency. --- RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32.sh b/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32.sh index 71e5c4f..8186ac5 100644 --- a/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32.sh +++ b/RosBE-Windows/Buildtoolchain/buildtoolchain-mingw32.sh @@ -271,9 +271,17 @@ if rs_prepare_module "gcc"; then fi if rs_prepare_module "ninja"; then - rs_do_command ../ninja/configure.py --bootstrap --platform mingw + # Ninja under Windows/MinGW needs special build directory handling. + old_path=$PATH + export PATH=".:$PATH" + + rs_do_command cd ../ninja + rs_do_command ./configure.py --bootstrap --platform mingw rs_do_command install ninja "$rs_prefixdir/bin" rs_clean_module "ninja" + + export PATH=$old_path + unset old_path fi # Final actions