Debugger: Adjust header order.

- Ensure that the debugger lib's headers are included before those of libshared
  to minimize conflicts between the respective Thread classes. Fixes gcc2 build.

Thanks to Jerome for reporting.
This commit is contained in:
Rene Gollent 2016-06-05 18:21:52 -04:00
parent 408530de9c
commit 9968f34302
2 changed files with 7 additions and 7 deletions

View File

@ -2,10 +2,7 @@ SubDir HAIKU_TOP src apps debugger ;
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UsePrivateHeaders app interface kernel shared system ;
UsePrivateSystemHeaders ;
UsePrivateHeaders debugger ;
UsePrivateHeaders debugger ;
UsePrivateHeaders [ FDirName debugger arch ] ;
UsePrivateHeaders [ FDirName debugger controllers ] ;
UsePrivateHeaders [ FDirName debugger debug_info ] ;
@ -28,6 +25,9 @@ UsePrivateHeaders [ FDirName debugger value value_formatters ] ;
UsePrivateHeaders [ FDirName debugger value value_nodes ] ;
UsePrivateHeaders [ FDirName debugger value values ] ;
UsePrivateHeaders app interface kernel shared system ;
UsePrivateSystemHeaders ;
UseBuildFeatureHeaders libedit ;
LINKFLAGS += -Wl,--exclude-libs,ALL ;

View File

@ -6,9 +6,6 @@ UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
UseHeaders [ FDirName $(TARGET_COMMON_DEBUG_OBJECT_DIR_$(TARGET_PACKAGING_ARCH))
system kernel ] ;
UsePrivateHeaders app debug interface kernel package shared libroot ;
UsePrivateSystemHeaders ;
UsePrivateHeaders debugger ;
UsePrivateHeaders [ FDirName debugger arch ] ;
UsePrivateHeaders [ FDirName debugger controllers ] ;
@ -32,6 +29,9 @@ UsePrivateHeaders [ FDirName debugger value value_formatters ] ;
UsePrivateHeaders [ FDirName debugger value value_nodes ] ;
UsePrivateHeaders [ FDirName debugger value values ] ;
UsePrivateHeaders app debug interface kernel package shared libroot ;
UsePrivateSystemHeaders ;
LINKFLAGS += -Wl,--exclude-libs,ALL ;
SubDirC++Flags [ FDefines _BSD_SOURCE=1 ] ;