diff --git a/reactos/configure.cmd b/reactos/configure.cmd index cca0412e481..78c206f0b25 100755 --- a/reactos/configure.cmd +++ b/reactos/configure.cmd @@ -214,6 +214,7 @@ if "%NEW_STYLE_BUILD%"=="0" ( if EXIST CMakeCache.txt ( del CMakeCache.txt /q + del host-tools\CMakeCache.txt /q ) if "%NEW_STYLE_BUILD%"=="0" ( diff --git a/reactos/configure.sh b/reactos/configure.sh index e4397231a61..64a18db4c8f 100755 --- a/reactos/configure.sh +++ b/reactos/configure.sh @@ -52,7 +52,7 @@ fi mkdir -p reactos -EXTRA_ARGS="" +#EXTRA_ARGS="" if [ $USE_NEW_STYLE -eq 0 ]; then mkdir -p host-tools echo Preparing host tools... @@ -62,14 +62,14 @@ if [ $USE_NEW_STYLE -eq 0 ]; then REACTOS_BUILD_TOOLS_DIR="$PWD" cmake -G "$CMAKE_GENERATOR" -DARCH:STRING=$ARCH $ROS_CMAKEOPTS -DNEW_STYLE_BUILD:BOOL=0 "$REACTOS_SOURCE_DIR" - EXTRA_ARGS="-DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR" + EXTRA_ARGS="$EXTRA_ARGS -DREACTOS_BUILD_TOOLS_DIR:PATH=$REACTOS_BUILD_TOOLS_DIR" cd .. fi echo Preparing reactos... cd reactos -rm -f CMakeCache.txt +rm -f CMakeCache.txt host-tools/CMakeCache.txt cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE:BOOL=0 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-gcc.cmake -DARCH:STRING=$ARCH -DNEW_STYLE_BUILD:BOOL=$USE_NEW_STYLE $EXTRA_ARGS $ROS_CMAKEOPTS "$REACTOS_SOURCE_DIR"