Skip to content

Commit

Permalink
Debugger: Adjust header order.
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
anevilyak committed Jun 5, 2016
1 parent 408530d commit 9968f34
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions src/apps/debugger/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ;
Expand All @@ -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 ;
Expand Down
6 changes: 3 additions & 3 deletions src/kits/debugger/Jamfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] ;
Expand All @@ -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 ] ;
Expand Down

0 comments on commit 9968f34

Please sign in to comment.