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

[reactos.git] / reactos / ntoskrnl / ntoskrnl-generic.rbuild

diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index d3ee631..6c7626b 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
        <bootstrap installbase="$(CDOUTPUT)" />
-       <importlibrary definition="ntoskrnl_$(ARCH).def" />
+       <importlibrary definition="ntoskrnl.pspec" />
        <define name="_DISABLE_TIDENTS" />
        <define name="__NTOSKRNL__" />
        <define name="_NTOSKRNL_" />
@@ -13,7 +13,7 @@
        <if property="_WINKD_" value="1">
                <define name="_WINKD_" />
        </if>
-       <if property="_ELF" value="1">
+       <if property="_ELF_" value="1">
                <define name="_ELF_" />
        </if>
        <include base="cmlib">.</include>
@@ -33,9 +33,11 @@
        <library>bootvid</library>
        <library>wdmguid</library>
        <dependency>bugcodes</dependency>
+       <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38269
        <directory name="include">
-               <pch>ntoskrnl.h</pch>
+               <pch>precomp.h</pch>
        </directory>
+       -->
        <directory name="ke">
                <if property="ARCH" value="i386">
                        <directory name="i386">
@@ -61,16 +63,16 @@
                <if property="ARCH" value="arm">
                        <directory name="arm">
                                <file first="true">boot.s</file>
-                               <file>arm_kprintf.c</file>
                                <file>cpu.c</file>
                                <file>ctxswtch.s</file>
                                <file>exp.c</file>
                                <file>kiinit.c</file>
                                <file>stubs_asm.s</file>
-                               <file>stubs.c</file>
                                <file>thrdini.c</file>
+                               <file>time.c</file>
                                <file>trap.s</file>
                                <file>trapc.c</file>
+                               <file>usercall.c</file>
                        </directory>
                </if>
                <if property="ARCH" value="powerpc">
@@ -256,6 +258,7 @@
                        <file>iowork.c</file>
                        <file>irp.c</file>
                        <file>irq.c</file>
+                       <file>ramdisk.c</file>
                        <file>rawfs.c</file>
                        <file>remlock.c</file>
                        <file>util.c</file>
@@ -271,6 +274,13 @@
                        <file>pnproot.c</file>
                </directory>
        </directory>
+       <directory name="kd">
+               <if property="ARCH" value="i386">
+                       <directory name="i386">
+                               <file>kdmemsup.c</file>
+                       </directory>
+               </if>
+       </directory>
        <if property="_WINKD_" value="0">
                <directory name="kdbg">
                        <if property="ARCH" value="i386">
@@ -292,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>
@@ -351,7 +361,6 @@
                        </directory>
                </if>
                <file>anonmem.c</file>
-               <file>aspace.c</file>
                <file>balance.c</file>
                <file>cont.c</file>
                <file>drvlck.c</file>
@@ -367,9 +376,6 @@
                <file>npool.c</file>
                <file>pagefile.c</file>
                <file>pageop.c</file>
-               <file>pager.c</file>
-               <file>pagfault.c</file>
-               <file>paging.c</file>
                <file>pe.c</file>
                <file>physical.c</file>
                <file>pool.c</file>
@@ -433,9 +439,13 @@
                                <file>rtlexcpt.c</file>
                        </directory>
                </if>
+               <if property="ARCH" value="i386">
+                       <directory name="i386">
+                               <file>stack.S</file>
+                       </directory>
+               </if>
                <file>libsupp.c</file>
                <file>misc.c</file>
-               <file>strtok.c</file>
        </directory>
        <directory name="se">
                <file>access.c</file>
@@ -458,8 +468,8 @@
                <file>wmi.c</file>
        </directory>
        <file>ntoskrnl.rc</file>
-       <linkerflag>-nostartfiles</linkerflag>
-       <linkerflag>-nostdlib</linkerflag>
-       <linkerflag>-lgcc</linkerflag>
        <linkerscript>ntoskrnl_$(ARCH).lnk</linkerscript>
+
+       <!-- See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=38054#c7 -->
+       <compilerflag>-fno-unit-at-a-time</compilerflag>
 </group>