Author: dreimer Date: Sat Sep 6 10:52:18 2008 New Revision: 35988
URL: http://svn.reactos.org/svn/reactos?rev=35988&view=rev Log: Remove temporary commented out lines. Show the Arch which is active on startup.
Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd
Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rosb... ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Sat Sep 6 10:52:18 2008 @@ -49,15 +49,8 @@ set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% set _ROSBE_GCCVERSION= set _ROSBE_GCCTARGET= -if not .%ROS_ARCH%. == .. ( - for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i - for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i -REM for /f "usebackq tokens=3" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i -REM for /f "usebackq tokens=2" %%i in (`"%ROS_PREFIX%-gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i -) else ( - for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i - for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i -) +for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i +for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i set PATH=%_ROSBE_MINGWPATH%\bin;%_ROSBE_MINGWPATH%\libexec\gcc%_ROSBE_GCCTARGET%%_ROSBE_GCCVERSION%;%_ROSBE_ORIGINALPATH% set _ROSBE_MINGWMAKE=%_ROSBE_MINGWPATH%\bin\mingw32-make.exe if "%_ROSBE_MODE%" == "MinGW" ( @@ -74,13 +67,22 @@ :: if not .%ROS_ARCH%. == .. ( %ROS_PREFIX%-gcc -v 2>&1 | find "gcc version" - echo gcc target^: %_ROSBE_GCCTARGET% + if .%ROS_PREFIX%. == .. ( + echo gcc target^: %_ROSBE_GCCTARGET% + ) else ( + echo gcc target^: %ROS_PREFIX:~0,-11% + ) %ROS_PREFIX%-ld -v ) else ( gcc -v 2>&1 | find "gcc version" - echo gcc target^: %_ROSBE_GCCTARGET% + if .%ROS_PREFIX%. == .. ( + echo gcc target^: %_ROSBE_GCCTARGET% + ) else ( + echo gcc target^: %ROS_PREFIX:~0,-11% + ) ld -v ) + if exist "%_ROSBE_MINGWPATH%\bin\nasm.exe" ( nasm -v ) else (