[sginsberg] 41448: - Do not pass gcc and ld flags to other tools

Author: sginsberg
Date: Thu Jun 18 22:18:57 2009
New Revision: 41448

URL: http://svn.reactos.org/svn/reactos?rev=41448&view=rev
Log:
- Do not pass gcc and ld flags to other tools

Modified:
    trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild
    trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild
    trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
    trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild
    trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild
    trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild
    trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild
    trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild
    trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild
    trunk/reactos/dll/directx/ddraw/ddraw.rbuild
    trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild
    trunk/reactos/dll/nls/idndl/idndl.rbuild
    trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild
    trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
    trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild
    trunk/reactos/dll/win32/advapi32/advapi32.rbuild
    trunk/reactos/dll/win32/crypt32/crypt32.rbuild
    trunk/reactos/dll/win32/gdi32/gdi32.rbuild
    trunk/reactos/dll/win32/kernel32/kernel32.rbuild
    trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild
    trunk/reactos/dll/win32/ole32/ole32.rbuild
    trunk/reactos/dll/win32/psapi/psapi.rbuild
    trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild
    trunk/reactos/dll/win32/riched20/riched20.rbuild
    trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
    trunk/reactos/dll/win32/setupapi/setupapi.rbuild
    trunk/reactos/dll/win32/syssetup/syssetup.rbuild
    trunk/reactos/dll/win32/user32/user32.rbuild
    trunk/reactos/dll/win32/wintrust/wintrust.rbuild
    trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild
    trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild
    trunk/reactos/drivers/input/mouclass/mouclass.rbuild
    trunk/reactos/drivers/network/afd/afd.rbuild
    trunk/reactos/drivers/network/tcpip/tcpip.rbuild
    trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild
    trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild
    trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild
    trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
    trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild
    trunk/reactos/lib/cmlib/cmlib.rbuild
    trunk/reactos/lib/inflib/inflib.rbuild
    trunk/reactos/lib/nls/idna/idna.rbuild
    trunk/reactos/lib/nls/normalize/normalize.rbuild
    trunk/reactos/lib/nls/scripts/scripts.rbuild
    trunk/reactos/lib/rtl/rtl.rbuild
    trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild
    trunk/reactos/subsystems/win32/win32k/win32k.rbuild
    trunk/reactos/tools/mkhive/mkhive.rbuild

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -13,8 +13,10 @@
 			<library>cmlib</library>
 			<library>rtl</library>
 			<library>libcntpr</library>
-			<linkerflag>-static</linkerflag>
-			<linkerflag>-lgcc</linkerflag>
+			<group linkerset="ld">
+				<linkerflag>-static</linkerflag>
+				<linkerflag>-lgcc</linkerflag>
+			</group>
 		</module>
 	</if>
 	<if property="ARCH" value="arm">
@@ -29,9 +31,11 @@
 			<library>cmlib</library>
 			<library>rtl</library>
 			<library>libcntpr</library>
-			<linkerflag>-lgcc</linkerflag>
-			<linkerflag>-static</linkerflag>
-			<linkerflag>-Wl,--section-start,pagedata=0x50000</linkerflag>
+			<group linkerset="ld">
+				<linkerflag>-lgcc</linkerflag>
+				<linkerflag>-static</linkerflag>
+				<linkerflag>-Wl,--section-start,pagedata=0x50000</linkerflag>
+			</group>
 		</module>
 	</if>
 	<if property="ARCH" value="powerpc">
@@ -60,8 +64,10 @@
 			<library>cmlib</library>
 			<library>rtl</library>
 			<library>libcntpr</library>
-			<linkerflag>-static</linkerflag>
-			<linkerflag>-lgcc</linkerflag>
+			<group linkerset="ld">
+				<linkerflag>-static</linkerflag>
+				<linkerflag>-lgcc</linkerflag>
+			</group>
 		</module>
 	</if>
 </group>

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild [iso-8859-1] Thu Jun 18
22:18:57 2009
@@ -7,13 +7,17 @@
 	<include base="ReactOS">include/reactos/libs</include>
 	<include base="ReactOS">include/reactos/elf</include>
 	<define name="_NTHAL_" />
-	<compilerflag>-fno-inline</compilerflag>
-	<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag>-fno-inline</compilerflag>
+		<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+	</group>
 
 	<if property="ARCH" value="arm">
-		<compilerflag>-ffreestanding</compilerflag>
-		<compilerflag>-fno-builtin</compilerflag>
-		<compilerflag>-Os</compilerflag>
+		<group compilerset="gcc">
+			<compilerflag>-ffreestanding</compilerflag>
+			<compilerflag>-fno-builtin</compilerflag>
+			<compilerflag>-Os</compilerflag>
+		</group>
 	</if>
 
 	<directory name="arch">

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.rbuild [iso-8859-1] Thu Jun 18
22:18:57 2009
@@ -7,8 +7,10 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_NTHAL_" />
 	<define name="_NTSYSTEM_" />
-	<compilerflag>-fno-inline</compilerflag>
-	<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag>-fno-inline</compilerflag>
+		<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+	</group>
 	<directory name="cache">
 		<file>blocklist.c</file>
 		<file>cache.c</file>

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr_base64k.rbuild [iso-8859-1] Thu Jun 18
22:18:57 2009
@@ -4,8 +4,10 @@
 	<include base="freeldr_base64k">include</include>
 	<include base="ntoskrnl">include</include>
 	<define name="_NTHAL_" />
-	<compilerflag>-fno-inline</compilerflag>
-	<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag>-fno-inline</compilerflag>
+		<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+	</group>
 	<directory name="arch">
 		<if property="ARCH" value="i386">
 			<directory name="i386">

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr_main.rbuild [iso-8859-1] Thu Jun 18
22:18:57 2009
@@ -4,7 +4,9 @@
 	<include base="freeldr_main">include</include>
 	<include base="ntoskrnl">include</include>
 	<define name="_NTHAL_" />
-	<compilerflag>-fno-inline</compilerflag>
-	<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag>-fno-inline</compilerflag>
+		<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+	</group>
 	<file>bootmgr.c</file>
 </module>

Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/freeldr_startup.rbuild [iso-8859-1] Thu Jun 18
22:18:57 2009
@@ -3,8 +3,10 @@
 <module name="freeldr_startup" type="objectlibrary">
 	<include base="freeldr_startup">include</include>
 	<include base="ntoskrnl">include</include>
-	<compilerflag>-fno-inline</compilerflag>
-	<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag>-fno-inline</compilerflag>
+		<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+	</group>
 	<directory name="arch">
 		<if property="ARCH" value="i386">
 			<directory name="i386">

Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -11,7 +11,9 @@
 	<library>cmlib</library>
 	<library>rtl</library>
 	<library>libcntpr</library>
-	<linkerflag>-nostartfiles</linkerflag>
-	<linkerflag>-nostdlib</linkerflag>
-	<linkerflag>-lgcc</linkerflag>
+	<group linkerset="ld">
+		<linkerflag>-nostartfiles</linkerflag>
+		<linkerflag>-nostdlib</linkerflag>
+		<linkerflag>-lgcc</linkerflag>
+	</group>
 </module>

Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Thu Jun 18
22:18:57 2009
@@ -5,11 +5,13 @@
 	<include base="ntoskrnl">include</include>
 	<define name="_NTHAL_" />
 	<define name="FREELDR_REACTOS_SETUP" />
-	<compilerflag>-ffreestanding</compilerflag>
-	<compilerflag>-fno-builtin</compilerflag>
-	<compilerflag>-fno-inline</compilerflag>
-	<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
-	<compilerflag>-Os</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag>-ffreestanding</compilerflag>
+		<compilerflag>-fno-builtin</compilerflag>
+		<compilerflag>-fno-inline</compilerflag>
+		<compilerflag>-fno-zero-initialized-in-bss</compilerflag>
+		<compilerflag>-Os</compilerflag>
+	</group>
 	<file>bootmgr.c</file>
 	<directory name="inffile">
 		<file>inffile.c</file>

Modified: trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/mesa32…
==============================================================================
--- trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -2,8 +2,8 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="mesa32" type="win32dll" entrypoint="0"
baseaddress="${BASEADDRESS_MESA32}" installbase="system32"
installname="mesa32.dll" allowwarnings="true"
crt="msvcrt">
 	<importlibrary definition="src/drivers/windows/icd/mesa.def" />
-	<linkerflag>-enable-stdcall-fixup</linkerflag>
-	<compilerflag>-w</compilerflag>
+	<linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag>
+	<compilerflag compilerset="gcc">-w</compilerflag>
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>

Modified: trunk/reactos/dll/directx/ddraw/ddraw.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw.rb…
==============================================================================
--- trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -71,5 +71,5 @@
 		<file>DirectD3D7_Vtable.c</file>
 	</directory>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr…
==============================================================================
--- trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -43,5 +43,5 @@
 	<dependency>wineheaders</dependency>
 
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/dll/nls/idndl/idndl.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl/idndl.rbuild…
==============================================================================
--- trunk/reactos/dll/nls/idndl/idndl.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/nls/idndl/idndl.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -2,8 +2,10 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="idndl" type="win32dll"
installname="idndl.dll" entrypoint="0">
 	<library>kernel32</library>
-	<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-	<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	</group>
 	<redefine name="WINVER">0x600</redefine>
 	<file>idndl.cpp</file>
 	<importlibrary definition="idndl.def" />

Modified: trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/idndl_redist/idndl…
==============================================================================
--- trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/nls/idndl_redist/idndl_redist.rbuild [iso-8859-1] Thu Jun 18
22:18:57 2009
@@ -3,9 +3,11 @@
 <module name="idndl_redist" type="win32dll"
installname="idndl_redist.dll" crt="libcntpr">
 	<library>kernel32</library>
 	<library>scripts</library>
-	<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-	<compilerflag compiler="cxx">-fno-rtti</compilerflag>
-	<linkerflag>--entry=0</linkerflag>
+	<group compilerset="gcc">
+		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	</group>
+	<linkerflag linkerset="ld">--entry=0</linkerflag>
 	<include base="icu4ros">icu/source/common</include>
 	<include base="scripts">.</include>
 	<importlibrary definition="idndl.def" />

Modified: trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/nls/normaliz_redist/no…
==============================================================================
--- trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/nls/normaliz_redist/normaliz_redist.rbuild [iso-8859-1] Thu Jun 18
22:18:57 2009
@@ -9,8 +9,10 @@
 	<library>idna</library>
 	<library>normaliz_redist_data</library>
 	<library>kernel32</library>
-	<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-	<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	</group>
 	<include base="icu4ros">icu/source/common</include>
 	<importlibrary definition="normaliz.def" />
 	<file>normaliz.cpp</file>

Modified: trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/actxprx…
==============================================================================
--- trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/actxprxy/actxprxy.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -16,7 +16,7 @@
 	<library>rpcrt4</library>
 	<library>pseh</library>
 	<file>usrmarshal.c</file>
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>
 <module name="actxprxy_interface" type="idlinterface">
 	<file>actxprxy_servprov.idl</file>

Modified: trunk/reactos/dll/win32/advapi32/advapi32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/advapi32.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -60,5 +60,5 @@
 			<file>token.c</file>
 	</directory>
 	<file>advapi32.rc</file>
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/dll/win32/crypt32/crypt32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crypt32/crypt32.…
==============================================================================
--- trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/crypt32/crypt32.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -37,5 +37,5 @@
 	<file>message.c</file>
 	<file>crypt32.rc</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui…
==============================================================================
--- trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -51,5 +51,5 @@
 	</directory>
 	<file>gdi32.rc</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -13,8 +13,12 @@
 		<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
 		<pch>k32.h</pch>
 		-->
-		<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-		<compilerflag>-fno-unit-at-a-time</compilerflag>
+		<group compilerset="gcc">
+			<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
+			<compilerflag>-fno-unit-at-a-time</compilerflag>
+			<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+			<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+		</group>
 		<directory name="debug">
 			<file>debugger.c</file>
 			<file>output.c</file>
@@ -129,9 +133,6 @@
 			</if>
 		</directory>
 
-		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
-
 		<directory name="misc">
 			<file>icustubs.cpp</file>
 		</directory>

Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.rb…
==============================================================================
--- trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msvcrt/msvcrt.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -9,7 +9,7 @@
 	<define name="__NO_CTYPE_INLINES" />
 	<define name="_CTYPE_DISABLE_MACROS" />
 	<define name="_NO_INLINING" />
-	<linkerflag>-enable-stdcall-fixup</linkerflag>
+	<linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag>
 
 	<!--	__MINGW_IMPORT needs to be defined differently because it's defined
 		as dllimport by default, which is invalid from GCC 4.1.0 on!	-->

Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui…
==============================================================================
--- trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -65,7 +65,7 @@
 	<file>irot.idl</file>
 	<include base="ole32" root="intermediate">.</include>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>
 <module name="ole32_irot_server" type="rpcserver">
 	<file>irot.idl</file>

Modified: trunk/reactos/dll/win32/psapi/psapi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/psapi/psapi.rbui…
==============================================================================
--- trunk/reactos/dll/win32/psapi/psapi.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/psapi/psapi.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -13,5 +13,5 @@
 	<file>psapi.c</file>
 	<file>psapi.rc</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/qmgrprxy/qmgrprx…
==============================================================================
--- trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/qmgrprxy/qmgrprxy.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -16,7 +16,7 @@
 	<library>rpcrt4</library>
 	<library>pseh</library>
 	<file>version.rc</file> <!-- we need at least one file in the module
-->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>
 <module name="qmgrprxy_interface" type="idlinterface">
 	<file>qmgrprxy.idl</file>

Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/riched2…
==============================================================================
--- trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -6,7 +6,7 @@
 	<include base="riched20">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
-	<linkerflag>-enable-stdcall-fixup</linkerflag>
+	<linkerflag linkerset="ld">-enable-stdcall-fixup</linkerflag>
 	<file>caret.c</file>
 	<file>clipboard.c</file>
 	<file>context.c</file>

Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.rb…
==============================================================================
--- trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -41,7 +41,7 @@
 	<file>epm.idl</file>
 	<include base="rpcrt4" root="intermediate">.</include>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>
 <module name="rpcrt4_epm_client" type="rpcclient">
 	<file>epm.idl</file>

Modified: trunk/reactos/dll/win32/setupapi/setupapi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap…
==============================================================================
--- trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/setupapi/setupapi.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -37,5 +37,5 @@
 	<file>rpc.c</file>
 	<file>setupapi.rc</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/dll/win32/syssetup/syssetup.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu…
==============================================================================
--- trunk/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/syssetup/syssetup.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -22,5 +22,5 @@
 	<file>wizard.c</file>
 	<file>syssetup.rc</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/dll/win32/user32/user32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb…
==============================================================================
--- trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/user32/user32.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -77,5 +77,5 @@
 	</directory>
 	<file>user32.rc</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/dll/win32/wintrust/wintrust.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus…
==============================================================================
--- trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -20,5 +20,5 @@
 	<file>softpub.c</file>
 	<file>version.rc</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wlanapi/wlanapi.…
==============================================================================
--- trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wlanapi/wlanapi.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -10,5 +10,5 @@
 	<library>ntdll</library>
 	<file>main.c</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd…
==============================================================================
--- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -10,5 +10,5 @@
 	<file>setup.c</file>
 	<file>kbdclass.rc</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/drivers/input/mouclass/mouclass.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou…
==============================================================================
--- trunk/reactos/drivers/input/mouclass/mouclass.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/input/mouclass/mouclass.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -9,5 +9,5 @@
 	<file>mouclass.c</file>
 	<file>mouclass.rc</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/drivers/network/afd/afd.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd.rb…
==============================================================================
--- trunk/reactos/drivers/network/afd/afd.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/afd/afd.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -28,5 +28,5 @@
 	</directory>
 	<file>afd.rc</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/drivers/network/tcpip/tcpip.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi…
==============================================================================
--- trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/tcpip/tcpip.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -40,5 +40,5 @@
 	</directory>
 	<file>tcpip.rc</file>
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd…
==============================================================================
--- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.rbuild [iso-8859-1] Thu Jun 18
22:18:57 2009
@@ -6,5 +6,5 @@
 	<library>hal</library>
 	<file>ramdisk.c</file>
 	<file>ramdisk.rc</file>
-	<compilerflag>-fms-extensions</compilerflag>
+	<compilerflag compilerset="gcc">-fms-extensions</compilerflag>
 </module>

Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…
==============================================================================
--- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild [iso-8859-1] Thu Jun 18
22:18:57 2009
@@ -4,8 +4,10 @@
 	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="uniata">.</include>
 	<include base="uniata">inc</include>
-	<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-	<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	</group>
 	<!-- define name="_DEBUG" /-->
 	<library>ntoskrnl</library>
 	<library>hal</library>

Modified: trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drivers/…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/drivers/mpu401/mpu401.rbuild [iso-8859-1] Thu Jun 18
22:18:57 2009
@@ -3,8 +3,10 @@
 <module name="mpu401" type="kernelmodedriver"
installbase="system32/drivers" installname="mpu401.sys"
allowwarnings="true">
 	<include base="mpu401">.</include>
 	<include base="mpu401">..</include>
-	<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-	<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	</group>
 	<library>ntoskrnl</library>
 	<library>portcls</library>
 	<file>mpu401.rc</file>

Modified: trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/drm/drmk…
==============================================================================
--- trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild [iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/drm/drmk/drmk.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -4,8 +4,10 @@
 	<include base="drmk">.</include>
 	<include base="drmk">..</include>
 	<include base="drmk">../include</include>
-	<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-	<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	</group>
 	<importlibrary definition="drmk.spec" />
 	<library>ntoskrnl</library>
 	<define name="BUILDING_DRMK" />

Modified: trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/icu4ros/icu4r…
==============================================================================
--- trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/3rdparty/icu4ros/icu4ros.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -5,8 +5,10 @@
 	<define name="U_HAVE_INTTYPES_H" />
 	<define name="UCONFIG_NO_FILE_IO">1</define>
 	<define name="ICU_NO_USER_DATA_OVERRIDE">1</define>
-	<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-	<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	</group>
 	<include base="icu4ros">icu/source/common</include>
 	<include base="icu4ros">icu/source/i18n</include>
 	<file>stubs.cpp</file>

Modified: trunk/reactos/lib/cmlib/cmlib.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.rbuild?rev…
==============================================================================
--- trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/cmlib/cmlib.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -20,8 +20,10 @@
 	<define name="_NTOSKRNL_" />
 	<define name="_NTSYSTEM_" />
 	<define name="NASSERT" />
-	<compilerflag>-Wwrite-strings</compilerflag>
-	<compilerflag>-Wpointer-arith</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag>-Wwrite-strings</compilerflag>
+		<compilerflag>-Wpointer-arith</compilerflag>
+	</group>
 	<define name="CMLIB_HOST" />
 	<file>cminit.c</file>
 	<file>hivebin.c</file>

Modified: trunk/reactos/lib/inflib/inflib.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/inflib.rbuild?r…
==============================================================================
--- trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/inflib/inflib.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -14,10 +14,12 @@
 <module name="inflibhost" type="hoststaticlibrary"
allowwarnings="true">
 	<include base="inflibhost">.</include>
 	<define name="__NO_CTYPE_INLINES" />
-	<compilerflag>-Wpointer-arith</compilerflag>
-	<compilerflag>-Wconversion</compilerflag>
-	<compilerflag>-Wstrict-prototypes</compilerflag>
-	<compilerflag>-Wmissing-prototypes</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag>-Wpointer-arith</compilerflag>
+		<compilerflag>-Wconversion</compilerflag>
+		<compilerflag>-Wstrict-prototypes</compilerflag>
+		<compilerflag>-Wmissing-prototypes</compilerflag>
+	</group>
 	<define name="INFLIB_HOST" />
 	<file>infcore.c</file>
 	<file>infget.c</file>

Modified: trunk/reactos/lib/nls/idna/idna.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/nls/idna/idna.rbuild?r…
==============================================================================
--- trunk/reactos/lib/nls/idna/idna.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/nls/idna/idna.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -5,8 +5,10 @@
 
 	<redefine name="WINVER">0x600</redefine>
 
-	<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-	<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	</group>
 	<include base="icu4ros">icu/source/common</include>
 	<file>idna.cpp</file>
 	<file>nameprep.cpp</file>

Modified: trunk/reactos/lib/nls/normalize/normalize.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/nls/normalize/normaliz…
==============================================================================
--- trunk/reactos/lib/nls/normalize/normalize.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/nls/normalize/normalize.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -3,8 +3,10 @@
 <module name="normalize" type="staticlibrary">
 	<library>icu4ros</library>
 	<redefine name="WINVER">0x600</redefine>
-	<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-	<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	</group>
 	<include base="icu4ros">icu/source/common</include>
 	<file>normalize.cpp</file>
 </module>

Modified: trunk/reactos/lib/nls/scripts/scripts.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/nls/scripts/scripts.rb…
==============================================================================
--- trunk/reactos/lib/nls/scripts/scripts.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/nls/scripts/scripts.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -3,8 +3,10 @@
 <module name="scripts" type="staticlibrary">
 	<library>icu4ros</library>
 	<redefine name="WINVER">0x600</redefine>
-	<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
-	<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	<group compilerset="gcc">
+		<compilerflag compiler="cxx">-fno-exceptions</compilerflag>
+		<compilerflag compiler="cxx">-fno-rtti</compilerflag>
+	</group>
 	<include base="icu4ros">icu/source/common</include>
 	<file>scripts.cpp</file>
 </module>

Modified: trunk/reactos/lib/rtl/rtl.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=414…
==============================================================================
--- trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/rtl.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -101,5 +101,5 @@
 	<pch>rtl.h</pch>
 	-->
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>

Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.…
==============================================================================
--- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -472,5 +472,5 @@
 	<linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript>
 
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </group>

Modified: trunk/reactos/subsystems/win32/win32k/win32k.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/win32k.rbuild [iso-8859-1] Thu Jun 18 22:18:57
2009
@@ -195,7 +195,7 @@
 	</directory>
 
 	<!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
-	<compilerflag>-fno-unit-at-a-time</compilerflag>
+	<compilerflag
compilerset="gcc">-fno-unit-at-a-time</compilerflag>
 </module>
 <module name="win32k" type="kernelmodedriver"
installbase="system32" installname="win32k.sys"
crt="libcntpr">
 	<importlibrary definition="win32k.pspec" />

Modified: trunk/reactos/tools/mkhive/mkhive.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.rbuild…
==============================================================================
--- trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] (original)
+++ trunk/reactos/tools/mkhive/mkhive.rbuild [iso-8859-1] Thu Jun 18 22:18:57 2009
@@ -6,7 +6,7 @@
 	<include base="zlibhost">.</include>
 	<include base="rtl">.</include>
 	<define name="MKHIVE_HOST" />
-	<compilerflag>-fshort-wchar</compilerflag>
+	<compilerflag compilerset="gcc">-fshort-wchar</compilerflag>
 	<library>inflibhost</library>
 	<library>cmlibhost</library>
 	<library>host_wcsfuncs</library>