From 03d334bbdf3d9df2eef3acf0f85064e5783e5873 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 27 Aug 2019 20:51:51 +0200 Subject: [PATCH] build fixes. sys/types.h cannot incliude endian.h because that creates circular include dependencies. Add proper multiarch grist to libcolumnlistview. --- headers/posix/sys/types.h | 1 - src/kits/tracker/Jamfile | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/headers/posix/sys/types.h b/headers/posix/sys/types.h index 28ddc6b27f..64d497eba9 100644 --- a/headers/posix/sys/types.h +++ b/headers/posix/sys/types.h @@ -122,7 +122,6 @@ struct _pthread_spinlock { }; -#include #include #include #include diff --git a/src/kits/tracker/Jamfile b/src/kits/tracker/Jamfile index a07321cf7c..34503b56d3 100644 --- a/src/kits/tracker/Jamfile +++ b/src/kits/tracker/Jamfile @@ -97,8 +97,9 @@ for architectureObject in [ MultiArchSubDirSetup ] { WidgetAttributeText.cpp : - be libcolumnlistview.a localestub shared translation + be localestub shared translation [ TargetLibstdc++ ] [ TargetLibsupc++ ] + [ MultiArchDefaultGristFiles libcolumnlistview.a ] [ MultiArchDefaultGristFiles libshortcuts_shared.a ] ; }