From 778ef3f92b8b5ea5ab7a4b34bb20b02a0569cc10 Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sun, 15 Jun 2014 16:36:32 -0400 Subject: [PATCH] Debugger: Adjustments to Jamfile. - Remove duplicate instance of libshared. - Add linker flags to not export symbols from linked in static libraries. Resolves an issue on gcc4 where symbols from libedit and libsolv would clash, leading to crashes. - Add package kit-related headers and libraries. --- src/apps/debugger/Jamfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/apps/debugger/Jamfile b/src/apps/debugger/Jamfile index e7f38affb0..4361841045 100644 --- a/src/apps/debugger/Jamfile +++ b/src/apps/debugger/Jamfile @@ -6,9 +6,11 @@ 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 shared libroot ; +UsePrivateHeaders app debug interface kernel package shared libroot ; UsePrivateSystemHeaders ; +LINKFLAGS += -Wl,--exclude-libs,ALL ; + SEARCH_SOURCE += [ FDirName $(SUBDIR) arch ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) arch x86 ] ; SEARCH_SOURCE += [ FDirName $(SUBDIR) arch x86_64 ] ; @@ -349,14 +351,13 @@ Application Debugger : debug_utils.a libcolumnlistview.a libshared.a - libshared.a libexpression_parser.a libmapm.a libedit.a libncurses.a $(TARGET_LIBSTDC++) - be tracker libbsd.so libdebug.so + be package tracker libbsd.so libdebug.so : Debugger.rdef ;