Haiku/buildtools
1
0
Fork 0
mirror of https://review.haiku-os.org/buildtools synced 2024-11-23 07:18:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

gcc: Adjust gcc header search paths

Browse Source 
* Drop /boot/common header paths
  I don't think pre-pm haiku will build anyway
  without using an older buildtools.
* Add secondary arch os header directories.
  Anything secondary arch that provides os
  headers will break without the proper search
  paths in gcc.
* Fixes secondary packages that depend on the
  OpenGL kit
This commit is contained in:
Alexander von Gluck IV 2014-01-14 17:52:48 -06:00
parent abc7211782
commit fd576c8d8a
2 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gcc/gcc/config/haiku.h
View File

@ -78,8 +78,7 @@ Boston, MA 02111-1307, USA. */
{ GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \
{ FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \
{ TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0 }, \
{ "/boot/common/non-packaged/develop/headers/" HYBRID_SECONDARY, 0, 0, 0, 1, 0 }, \
{ "/boot/common/develop/headers/" HYBRID_SECONDARY, 0, 0, 0, 1, 0 }, \
{ "/boot/system/non-packaged/develop/headers/" HYBRID_SECONDARY, 0, 0, 0, 1, 0 }, \
{ "/boot/system/develop/headers/os", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/os/app", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/os/device", 0, 0, 1, 1, 0 }, \
@ -112,6 +111,24 @@ Boston, MA 02111-1307, USA. */
{ "/boot/system/develop/headers/gnu", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/posix", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY, 0, 0, 0, 1, 0 }, \
/* Hybrid secondary folders for os kits not in base haiku package */\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/app", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/device", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/drivers", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/game", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/interface", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/kernel", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/locale", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/mail", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/media", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/midi", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/midi2", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/net", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/opengl", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/storage", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/support", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/translation", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers", 0, 0, 0, 1, 0 }, \
{ 0, 0, 0, 0, 0, 0 } \
}
@ -129,8 +146,7 @@ Boston, MA 02111-1307, USA. */
{ GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \
{ FIXED_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, \
{ TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0 }, \
{ "/boot/common/non-packaged/develop/headers", 0, 0, 0, 1, 0 }, \
{ "/boot/common/develop/headers", 0, 0, 0, 1, 0 }, \
{ "/boot/system/non-packaged/develop/headers", 0, 0, 0, 1, 0 }, \
{ "/boot/system/develop/headers/os", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/os/app", 0, 0, 1, 1, 0 }, \
{ "/boot/system/develop/headers/os/device", 0, 0, 1, 1, 0 }, \

26
legacy/gcc/gcc/config/i386/haiku.h
View File

@ -364,8 +364,7 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
{ \
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },\
{ GCC_INCLUDE_DIR, "GCC", 0, 0 },\
{ "/boot/common/non-packaged/develop/headers", 0, 0, 0 },\
{ "/boot/common/develop/headers", 0, 0, 0 },\
{ "/boot/system/non-packaged/develop/headers", 0, 0, 0 },\
{ "/boot/system/develop/headers/os", 0, 0, 1 },\
{ "/boot/system/develop/headers/os/app", 0, 0, 1 },\
{ "/boot/system/develop/headers/os/device", 0, 0, 1 },\
@ -404,8 +403,7 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
{ \
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },\
{ GCC_INCLUDE_DIR, "GCC", 0, 0 },\
{ "/boot/common/non-packaged/develop/headers/" HYBRID_SECONDARY, 0, 0, 0 },\
{ "/boot/common/develop/headers/" HYBRID_SECONDARY, 0, 0, 0 },\
{ "/boot/system/non-packaged/develop/headers/" HYBRID_SECONDARY, 0, 0, 0 },\
{ "/boot/system/develop/headers/os", 0, 0, 1 },\
{ "/boot/system/develop/headers/os/app", 0, 0, 1 },\
{ "/boot/system/develop/headers/os/device", 0, 0, 1 },\
@ -436,7 +434,25 @@ extern union tree_node *i386_pe_merge_decl_attributes ();
{ "/boot/system/develop/headers/glibc", 0, 0, 1 },\
{ "/boot/system/develop/headers/gnu", 0, 0, 1 },\
{ "/boot/system/develop/headers/posix", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY, 0, 0, 0 }, \
{ "/boot/system/develop/headers/" HYBRID_SECONDARY, 0, 0, 0 },\
/* Hybrid secondary folders for os kits not in base haiku package */\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/app", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/device", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/drivers", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/game", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/interface", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/kernel", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/locale", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/mail", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/media", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/midi", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/midi2", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/net", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/opengl", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/storage", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/support", 0, 0, 1 },\
{ "/boot/system/develop/headers/" HYBRID_SECONDARY "/os/translation", 0, 0, 1 },\
{ "/boot/system/develop/headers", 0, 0, 0 }, \
{ 0, 0, 0, 0 } \
};