Author: spetreolle
Date: Fri May 31 21:27:50 2013
New Revision: 59130
URL:
http://svn.reactos.org/svn/reactos?rev=59130&view=rev
Log:
Fix configure on *nixes.
Arch, don't use brackets, thats meant to execute something.
Modified:
trunk/reactos/configure.sh
Modified: trunk/reactos/configure.sh
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59130&…
==============================================================================
--- trunk/reactos/configure.sh [iso-8859-1] (original)
+++ trunk/reactos/configure.sh [iso-8859-1] Fri May 31 21:27:50 2013
@@ -9,7 +9,7 @@
ARCH=$ROS_ARCH
REACTOS_SOURCE_DIR=$(cd `dirname $0` && pwd)
REACTOS_OUTPUT_PATH=output-$BUILD_ENVIRONMENT-$ARCH
-if [ ("$1" = "Makefiles") -o ("$1" = "makefiles")
]; then
+if [ "$1" = "Makefiles" -o "$1" = "makefiles" ];
then
CMAKE_GENERATOR="Unix Makefiles"
else
CMAKE_GENERATOR="Ninja"
@@ -34,6 +34,6 @@
cd ../reactos
rm -f CMakeCache.txt
-cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0
-DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH
-DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR"
"$REACTOS_SOURCE_DIR"
+cmake -G "$CMAKE_GENERATOR" -DNEWCC=0 -DENABLE_CCACHE=0 -DPCH=0
-DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH
-DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR"
"$REACTOS_SOURCE_DIR"
echo Configure script complete! Enter directories and execute appropriate build
commands\(ex: ninja, make, makex, etc...\).