KDBG needs DBG to be set, I can't imagine any useful situation for KDBG without DBG.

Change the <if> logic in ReactOS-general.rbuild (and ReactOS-arm.rbuild for the ARM guys) accordingly. This also supersedes DBG_OR_KDBG, which never worked properly for Release builds anyway.

Should fix the Release build without touching rbuild itself :-)

svn path=/trunk/; revision=37808

reactos/ReactOS-arm.rbuild

@@ -17,11 +17,10 @@
 	<if property="DBG" value="1">
 		<define name="DBG">1</define>
 		<define name="_SEH_ENABLE_TRACE" />
-		<property name="DBG_OR_KDBG" value="true" />
-	</if>
-	<if property="KDBG" value="1">
-		<define name="KDBG">1</define>
-		<property name="DBG_OR_KDBG" value="true" />
+		
+		<if property="KDBG" value="1">
+			<define name="KDBG">1</define>
+		</if>
 	</if>
 	
 	<include>.</include>

reactos/ReactOS-generic.rbuild

@@ -9,11 +9,10 @@
 	<if property="DBG" value="1">
 		<define name="DBG">1</define>
 		<define name="_SEH_ENABLE_TRACE" />
-		<property name="DBG_OR_KDBG" value="true" />
-	</if>
-	<if property="KDBG" value="1">
-		<define name="KDBG">1</define>
-		<property name="DBG_OR_KDBG" value="true" />
+		
+		<if property="KDBG" value="1">
+			<define name="KDBG">1</define>
+		</if>
 	</if>
 
 	<!-- The version target valid values are: Nt4 , NT5 , NT51 -->

reactos/config.template.rbuild

@@ -43,7 +43,7 @@
 
 
 <!--
-	Whether to compile in the integrated kernel debugger.
+	Whether to compile in the integrated kernel debugger. Requires DBG to be set.
 -->
 <property name="KDBG" value="1" />
 

reactos/ntoskrnl/ntoskrnl-generic.rbuild

@@ -302,7 +302,7 @@
 				<file>kdb_keyboard.c</file>
 				<file>kdb_serial.c</file>
 			</if>
-			<if property="DBG_OR_KDBG" value="true">
+			<if property="DBG" value="1">
 				<file>kdb_symbols.c</file>
 			</if>
 		</directory>