[Title] Used msys-make instead of mingw32-make

diff --git a/package/changelog b/package/changelog
index a981584..605e477 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,6 @@
+* 1.1.4
+- Use msys-make instead of mingw32-make
+== donghee yang <donghee.yang@samsung.com> 2012-12-13
 * 1.1.2
 - Used "cmd.exe" instead of "sh.exe" in mingw32-make
 - Applied "-r" option in make on windows 

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 80beab5..c90adb1 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source : sbi-plugins
-Version : 1.1.2
+Version : 1.1.4
 Maintainer : Taejun Ha <taejun.ha@samsung.com>, Jiil Hyoun <jiil.hyoun@samsung.com>, Donghyuk Yang <donghyuk.yang@samsung.com>, Donghee Yang<donghee.yang@samsung.com>
 
 Package : sbi-toolchain-gcc-4.5.cpp.app

diff --git a/xml/windows/gcc45.armel.cpp.app.xml b/xml/windows/gcc45.armel.cpp.app.xml
index cdac2a8..8c75ca0 100644 (file)
--- a/xml/windows/gcc45.armel.cpp.app.xml
+++ b/xml/windows/gcc45.armel.cpp.app.xml
@@ -7,7 +7,7 @@
         <tool name="debugger" version="GNU gdb (Linaro GDB) 7.2-2011.03-0" path="#{SBI_HOME}/../arm-linux-gnueabi-gdb-7.2/bin/arm-linux-gnueabi-gdb.exe"/>
         <tool name="assembler" version="GNU as (GNU Binutils) 2.22" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin/arm-linux-gnueabi-as.exe"/>
         <tool name="strip" version="GNU strip (GNU Binutils) 2.22" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin/arm-linux-gnueabi-strip.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <tool name="binutils" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin"/>
                <tool name="tpk_packager" path="#{SBI_HOME}/bin/tpk.exe"/>
@@ -36,10 +36,14 @@ set RS_LINKER_MISC=%9
 for %%F in (%GCC_BIN_PATH%) do (
        set GCC_BIN_DIR=%%~dpF
        set CC=%%F )
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 
-REM make
 set PATH=%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>

diff --git a/xml/windows/gcc45.armel.cpp.sharedLib.xml b/xml/windows/gcc45.armel.cpp.sharedLib.xml
index e9e1919..9fb478c 100644 (file)
--- a/xml/windows/gcc45.armel.cpp.sharedLib.xml
+++ b/xml/windows/gcc45.armel.cpp.sharedLib.xml
@@ -5,7 +5,7 @@
         <tool name="c++_compiler" version="gcc linaro-4.5-2012.01" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin/arm-linux-gnueabi-g++.exe"/>
         <tool name="debugger" version="GNU gdb (Linaro GDB) 7.2-2011.03-0" path="#{SBI_HOME}/../arm-linux-gnueabi-gdb-7.2/bin/arm-linux-gnueabi-gdb.exe"/>
         <tool name="assembler" version="GNU as (GNU Binutils) 2.22" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin/arm-linux-gnueabi-as.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <action name="make">
             <execute script="bat">
@@ -18,10 +18,14 @@ set MAKE_BIN=%1
 set OPTIONS=%~2
 set GCC_BIN_PATH=%3
 for %%F in (%GCC_BIN_PATH%) do set GCC_BIN_DIR=%%~dpF
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 
-REM make
 set PATH=%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>

diff --git a/xml/windows/gcc45.armel.cpp.staticLib.xml b/xml/windows/gcc45.armel.cpp.staticLib.xml
index be694bc..c298fbe 100644 (file)
--- a/xml/windows/gcc45.armel.cpp.staticLib.xml
+++ b/xml/windows/gcc45.armel.cpp.staticLib.xml
@@ -5,7 +5,7 @@
         <tool name="c++_compiler" version="gcc linaro-4.5-2012.01" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin/arm-linux-gnueabi-g++.exe"/>
         <tool name="debugger" version="GNU gdb (Linaro GDB) 7.2-2011.03-0" path="#{SBI_HOME}/../arm-linux-gnueabi-gdb-7.2/bin/arm-linux-gnueabi-gdb.exe"/>
         <tool name="assembler" version="GNU as (GNU Binutils) 2.22" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin/arm-linux-gnueabi-as.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <action name="make">
             <execute script="bat">
@@ -18,10 +18,14 @@ set MAKE_BIN=%1
 set OPTIONS=%~2
 set GCC_BIN_PATH=%3
 for %%F in (%GCC_BIN_PATH%) do set GCC_BIN_DIR=%%~dpF
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 
-REM make
 set PATH=%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>

diff --git a/xml/windows/gcc45.i386.cpp.app.xml b/xml/windows/gcc45.i386.cpp.app.xml
index 27654e4..6388049 100644 (file)
--- a/xml/windows/gcc45.i386.cpp.app.xml
+++ b/xml/windows/gcc45.i386.cpp.app.xml
@@ -6,7 +6,7 @@
         <tool name="c++_compiler" version="gcc linaro-4.5-2012.01" path="#{SBI_HOME}/../i386-linux-gnueabi-gcc-4.5/bin/i386-linux-gnueabi-g++.exe"/>
         <tool name="debugger" version="GNU gdb (Linaro GDB) 7.2-2011.03-0" path="#{SBI_HOME}/../i386-linux-gnueabi-gdb-7.2/bin/i386-linux-gnueabi-gdb.exe"/>
         <tool name="assembler" version="GNU as (GNU Binutils) 2.22" path="#{SBI_HOME}/../i386-linux-gnueabi-gcc-4.5/bin/i386-linux-gnueabi-as.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <tool name="binutils" path="#{SBI_HOME}/../i386-linux-gnueabi-gcc-4.5/bin"/>
                <tool name="tpk_packager" path="#{SBI_HOME}/bin/tpk.exe"/>
@@ -35,10 +35,14 @@ set RS_LINKER_MISC=%9
 for %%F in (%GCC_BIN_PATH%) do (
        set GCC_BIN_DIR=%%~dpF
        set CC=%%F )
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 
-REM make
 set PATH=%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>

diff --git a/xml/windows/gcc45.i386.cpp.sharedLib.xml b/xml/windows/gcc45.i386.cpp.sharedLib.xml
index e86a4a8..4c3535f 100644 (file)
--- a/xml/windows/gcc45.i386.cpp.sharedLib.xml
+++ b/xml/windows/gcc45.i386.cpp.sharedLib.xml
@@ -5,7 +5,7 @@
         <tool name="c++_compiler" version="gcc linaro-4.5-2012.01" path="#{SBI_HOME}/../i386-linux-gnueabi-gcc-4.5/bin/i386-linux-gnueabi-g++.exe"/>
         <tool name="debugger" version="GNU gdb (Linaro GDB) 7.2-2011.03-0" path="#{SBI_HOME}/../i386-linux-gnueabi-gdb-7.2/bin/i386-linux-gnueabi-gdb.exe"/>
         <tool name="assembler" version="GNU as (GNU Binutils) 2.22" path="#{SBI_HOME}/../i386-linux-gnueabi-gcc-4.5/bin/i386-linux-gnueabi-as.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <action name="make">
             <execute script="bat">
@@ -18,10 +18,14 @@ set MAKE_BIN=%1
 set OPTIONS=%~2
 set GCC_BIN_PATH=%3
 for %%F in (%GCC_BIN_PATH%) do set GCC_BIN_DIR=%%~dpF
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 
-REM make
 set PATH=%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>

diff --git a/xml/windows/gcc45.i386.cpp.staticLib.xml b/xml/windows/gcc45.i386.cpp.staticLib.xml
index ee73b9e..b92da3b 100644 (file)
--- a/xml/windows/gcc45.i386.cpp.staticLib.xml
+++ b/xml/windows/gcc45.i386.cpp.staticLib.xml
@@ -5,7 +5,7 @@
         <tool name="c++_compiler" version="gcc linaro-4.5-2012.01" path="#{SBI_HOME}/../i386-linux-gnueabi-gcc-4.5/bin/i386-linux-gnueabi-g++.exe"/>
         <tool name="debugger" version="GNU gdb (Linaro GDB) 7.2-2011.03-0" path="#{SBI_HOME}/../i386-linux-gnueabi-gdb-7.2/bin/i386-linux-gnueabi-gdb.exe"/>
         <tool name="assembler" version="GNU as (GNU Binutils) 2.22" path="#{SBI_HOME}/../i386-linux-gnueabi-gcc-4.5/bin/i386-linux-gnueabi-as.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <action name="make">
             <execute script="bat">
@@ -18,10 +18,14 @@ set MAKE_BIN=%1
 set OPTIONS=%~2
 set GCC_BIN_PATH=%3
 for %%F in (%GCC_BIN_PATH%) do set GCC_BIN_DIR=%%~dpF
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 
-REM make
 set PATH=%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>

diff --git a/xml/windows/llvm31.armel.cpp.app.xml b/xml/windows/llvm31.armel.cpp.app.xml
index 8bb2c87..3dd3605 100644 (file)
--- a/xml/windows/llvm31.armel.cpp.app.xml
+++ b/xml/windows/llvm31.armel.cpp.app.xml
@@ -11,7 +11,7 @@
         <tool name="assembler" version="LLVM/CLANG version 3.1" path="#{SBI_HOME}/../llvm-3.1/bin/clang++.exe"/>
         <tool name="strip" version="GNU strip (GNU Binutils) 2.22" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin/arm-linux-gnueabi-strip.exe"/>
         <tool name="gcc" version="gcc linaro-4.5-2012.01" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin/arm-linux-gnueabi-gcc.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <tool name="binutils" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin"/>
                <tool name="tpk_packager" path="#{SBI_HOME}/bin/tpk.exe"/>
@@ -44,10 +44,14 @@ for %%F in (%CLANG_BIN_PATH%) do (
        set CLANG_BIN_DIR=%%~dpF
        set CC=%%F )
 for %%F in (%GCC_BIN_PATH%) do set GCC_BIN_DIR=%%~dpF
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 
-REM make
 set PATH=%CLANG_BIN_DIR%;%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>

diff --git a/xml/windows/llvm31.armel.cpp.sharedLib.xml b/xml/windows/llvm31.armel.cpp.sharedLib.xml
index 387f609..9a607d8 100644 (file)
--- a/xml/windows/llvm31.armel.cpp.sharedLib.xml
+++ b/xml/windows/llvm31.armel.cpp.sharedLib.xml
@@ -9,7 +9,7 @@
         <tool name="debugger" version="GNU gdb (Linaro GDB) 7.2-2011.03-0" path="#{SBI_HOME}/../arm-linux-gnueabi-gdb-7.2/bin/arm-linux-gnueabi-gdb.exe"/>
         <tool name="assembler" version="LLVM/CLANG version 3.1" path="#{SBI_HOME}/../llvm-3.1/bin/clang++.exe"/>
         <tool name="gcc" version="gcc linaro-4.5-2012.01" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin/arm-linux-gnueabi-gcc.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <action name="make">
             <execute script="bat">
@@ -25,10 +25,14 @@ set CLANG_BIN_PATH=%3
 set GCC_BIN_PATH=%4
 for %%F in (%CLANG_BIN_PATH%) do set CLANG_BIN_DIR=%%~dpF
 for %%F in (%GCC_BIN_PATH%) do set GCC_BIN_DIR=%%~dpF
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 
-REM make
 set PATH=%CLANG_BIN_DIR%;%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>

diff --git a/xml/windows/llvm31.armel.cpp.staticLib.xml b/xml/windows/llvm31.armel.cpp.staticLib.xml
index 19ddfcd..f00fafd 100644 (file)
--- a/xml/windows/llvm31.armel.cpp.staticLib.xml
+++ b/xml/windows/llvm31.armel.cpp.staticLib.xml
@@ -9,7 +9,7 @@
         <tool name="debugger" version="GNU gdb (Linaro GDB) 7.2-2011.03-0" path="#{SBI_HOME}/../arm-linux-gnueabi-gdb-7.2/bin/arm-linux-gnueabi-gdb.exe"/>
         <tool name="assembler" version="LLVM/CLANG version 3.1" path="#{SBI_HOME}/../llvm-3.1/bin/clang++.exe"/>
         <tool name="gcc" version="gcc linaro-4.5-2012.01" path="#{SBI_HOME}/../arm-linux-gnueabi-gcc-4.5/bin/arm-linux-gnueabi-gcc.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <action name="make">
             <execute script="bat">
@@ -24,11 +24,15 @@ set OPTIONS=%~2
 set CLANG_BIN_PATH=%3
 set GCC_BIN_PATH=%4
 for %%F in (%CLANG_BIN_PATH%) do set CLANG_BIN_DIR=%%~dpF
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 for %%F in (%GCC_BIN_PATH%) do set GCC_BIN_DIR=%%~dpF
 
-REM make
 set PATH=%CLANG_BIN_DIR%;%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>

diff --git a/xml/windows/llvm31.i386.cpp.app.xml b/xml/windows/llvm31.i386.cpp.app.xml
index b2efa1f..ea3af14 100644 (file)
--- a/xml/windows/llvm31.i386.cpp.app.xml
+++ b/xml/windows/llvm31.i386.cpp.app.xml
@@ -10,7 +10,7 @@
         <tool name="debugger" version="GNU gdb (Linaro GDB) 7.2-2011.03-0" path="#{SBI_HOME}/../i386-linux-gnueabi-gdb-7.2/bin/i386-linux-gnueabi-gdb.exe"/>
         <tool name="assembler" version="LLVM/CLANG version 3.1" path="#{SBI_HOME}/../llvm-3.1/bin/clang++.exe"/>
         <tool name="gcc" version="gcc linaro-4.5-2012.01" path="#{SBI_HOME}/../i386-linux-gnueabi-gcc-4.5/bin/i386-linux-gnueabi-gcc.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <tool name="binutils" path="#{SBI_HOME}/../i386-linux-gnueabi-gcc-4.5/bin"/>
                <tool name="tpk_packager" path="#{SBI_HOME}/bin/tpk.exe"/>
@@ -43,10 +43,14 @@ for %%F in (%CLANG_BIN_PATH%) do (
        set CLANG_BIN_DIR=%%~dpF
        set CC=%%F )
 for %%F in (%GCC_BIN_PATH%) do set GCC_BIN_DIR=%%~dpF
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 
-REM make
 set PATH=%CLANG_BIN_DIR%;%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>

diff --git a/xml/windows/llvm31.i386.cpp.sharedLib.xml b/xml/windows/llvm31.i386.cpp.sharedLib.xml
index 9d95347..98c8963 100644 (file)
--- a/xml/windows/llvm31.i386.cpp.sharedLib.xml
+++ b/xml/windows/llvm31.i386.cpp.sharedLib.xml
@@ -9,7 +9,7 @@
         <tool name="debugger" version="GNU gdb (Linaro GDB) 7.2-2011.03-0" path="#{SBI_HOME}/../i386-linux-gnueabi-gdb-7.2/bin/i386-linux-gnueabi-gdb.exe"/>
         <tool name="assembler" version="LLVM/CLANG version 3.1" path="#{SBI_HOME}/../llvm-3.1/bin/clang++.exe"/>
         <tool name="gcc" version="gcc linaro-4.5-2012.01" path="#{SBI_HOME}/../i386-linux-gnueabi-gcc-4.5/bin/i386-linux-gnueabi-gcc.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <action name="make">
             <execute script="bat">
@@ -25,10 +25,14 @@ set CLANG_BIN_PATH=%3
 set GCC_BIN_PATH=%4
 for %%F in (%CLANG_BIN_PATH%) do set CLANG_BIN_DIR=%%~dpF
 for %%F in (%GCC_BIN_PATH%) do set GCC_BIN_DIR=%%~dpF
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 
-REM make
 set PATH=%CLANG_BIN_DIR%;%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>

diff --git a/xml/windows/llvm31.i386.cpp.staticLib.xml b/xml/windows/llvm31.i386.cpp.staticLib.xml
index 191a2dd..2e12dd6 100644 (file)
--- a/xml/windows/llvm31.i386.cpp.staticLib.xml
+++ b/xml/windows/llvm31.i386.cpp.staticLib.xml
@@ -9,7 +9,7 @@
         <tool name="debugger" version="GNU gdb (Linaro GDB) 7.2-2011.03-0" path="#{SBI_HOME}/../i386-linux-gnueabi-gdb-7.2/bin/i386-linux-gnueabi-gdb.exe"/>
         <tool name="assembler" version="LLVM/CLANG version 3.1" path="#{SBI_HOME}/../llvm-3.1/bin/clang++.exe"/>
         <tool name="gcc" version="gcc linaro-4.5-2012.01" path="#{SBI_HOME}/../i386-linux-gnueabi-gcc-4.5/bin/i386-linux-gnueabi-gcc.exe"/>
-        <tool name="make" path="#{SBI_HOME}/../mingw/bin/mingw32-make.exe"/>
+        <tool name="make" path="#{SBI_HOME}/../mingw/msys/1.0/bin/make.exe"/>
         <tool name="msgfmt" path="#{SBI_HOME}/../mingw/bin/msgfmt.exe"/>
         <action name="make">
             <execute script="bat">
@@ -25,10 +25,14 @@ set CLANG_BIN_PATH=%3
 set GCC_BIN_PATH=%4
 for %%F in (%CLANG_BIN_PATH%) do set CLANG_BIN_DIR=%%~dpF
 for %%F in (%GCC_BIN_PATH%) do set GCC_BIN_DIR=%%~dpF
+for %%F in (%MAKE_BIN%) do set MAKE_NAME=%%~nF
 
-REM make
 set PATH=%CLANG_BIN_DIR%;%GCC_BIN_DIR%;%PATH%
-%MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+if "%MAKE_NAME%" == "mingw32-make" ( 
+       %MAKE_BIN% %OPTIONS% --eval="SHELL=cmd" -r
+) else (
+       %MAKE_BIN% %OPTIONS% -r
+)
                 </script>
             </execute>
         </action>