haiku/buildtools
1
0
Fork 0
mirror of https://review.haiku-os.org/buildtools synced 2026-02-04 07:53:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Attempt at fixing the cross-compiler config. Some cleanup in the default includes as well.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@29048 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2009-01-26 20:53:59 +00:00
parent 0bf091a9aa
commit 8c7e3ca14b
2 changed files with 27 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,42 +73,36 @@ Boston, MA 02111-1307, USA. */
for the Haiku include files relative to TOOL_INCLUDE_DIR. Yes, we
use ANSI string concatenation here (FIXME) */
#ifndef CROSS_COMPILE
#ifndef CROSS_DIRECTORY_STRUCTURE
#undef INCLUDE_DEFAULTS
#define INCLUDE_DEFAULTS \
{ \
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },\
{ GCC_INCLUDE_DIR, "GCC", 0, 0 },\
{ TOOL_INCLUDE_DIR, "BINUTILS", 0, 1}, \
{ "/boot/develop/headers/os/add-ons/graphics", 0, 0, 0 },\
{ "/boot/develop/headers/os/devel", 0, 0, 0 },\
{ "/boot/develop/headers/os/translation", 0, 0, 0 },\
{ "/boot/develop/headers/os/mail", 0, 0, 0 },\
{ "/boot/develop/headers/os", 0, 0, 0 },\
{ "/boot/develop/headers/os/app", 0, 0, 0 },\
{ "/boot/develop/headers/os/device", 0, 0, 0 },\
{ "/boot/develop/headers/os/drivers", 0, 0, 0 },\
{ "/boot/develop/headers/os/opengl", 0, 0, 0 },\
{ "/boot/develop/headers/os/game", 0, 0, 0 },\
{ "/boot/develop/headers/os/support", 0, 0, 0 },\
{ "/boot/develop/headers/os/storage", 0, 0, 0 },\
{ "/boot/develop/headers/os/interface", 0, 0, 0 },\
{ "/boot/develop/headers/os/kernel", 0, 0, 0 },\
{ "/boot/develop/headers/os/net", 0, 0, 0 },\
{ "/boot/develop/headers/os/mail", 0, 0, 0 },\
{ "/boot/develop/headers/os/media", 0, 0, 0 },\
{ "/boot/develop/headers/os/midi", 0, 0, 0 },\
{ "/boot/develop/headers/os/midi2", 0, 0, 0 },\
{ "/boot/develop/headers/os/media", 0, 0, 0 },\
{ "/boot/develop/headers/os/interface", 0, 0, 0 },\
{ "/boot/develop/headers/os/device", 0, 0, 0 },\
{ "/boot/develop/headers/os/app", 0, 0, 0 },\
{ "/boot/develop/headers/os/precompiled", 0, 0, 0 },\
{ "/boot/develop/headers/os/net", 0, 0, 0 },\
{ "/boot/develop/headers/os/opengl", 0, 0, 0 },\
{ "/boot/develop/headers/os/storage", 0, 0, 0 },\
{ "/boot/develop/headers/os/support", 0, 0, 0 },\
{ "/boot/develop/headers/os/translation", 0, 0, 0 },\
{ "/boot/develop/headers/os/add-ons/graphics", 0, 0, 0 },\
{ "/boot/develop/headers/os/add-ons/input_server", 0, 0, 0 },\
{ "/boot/develop/headers/os/add-ons/net_server", 0, 0, 0 },\
{ "/boot/develop/headers/os/add-ons/screen_saver", 0, 0, 0 },\
{ "/boot/develop/headers/os/add-ons/tracker", 0, 0, 0 },\
{ "/boot/develop/headers/os/be_apps/Deskbar", 0, 0, 0 },\
{ "/boot/develop/headers/os/be_apps/NetPositive", 0, 0, 0 },\
{ "/boot/develop/headers/os/be_apps/Tracker", 0, 0, 0 },\
{ "/boot/develop/headers/os/drivers/tty", 0, 0, 0 },\
{ "/boot/develop/headers/os/net/netinet", 0, 0, 0 },\
{ "/boot/develop/headers/os/storage", 0, 0, 0 },\
{ "/boot/develop/headers/os", 0, 0, 0 },\
{ "/boot/develop/headers/gnu", 0, 0, 0 },\
{ "/boot/develop/headers/cpp", 0, 0, 0 },\
{ "/boot/develop/headers/bsd", 0, 0, 0 },\
@@ -116,42 +110,37 @@ Boston, MA 02111-1307, USA. */
{ "/boot/develop/headers", 0, 0, 0 }, \
{ 0, 0, 0, 0 } \
}
#else /* CROSS_COMPILE */
#else /* CROSS_DIRECTORY_STRUCTURE */
#undef INCLUDE_DEFAULTS
#define INCLUDE_DEFAULTS \
{ \
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },\
{ GCC_INCLUDE_DIR, "GCC", 0, 0 },\
{ TOOL_INCLUDE_DIR, "BINUTILS", 0, 1}, \
{ CROSS_INCLUDE_DIR "/os/add-ons/graphics", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/devel", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/translation", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/mail", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/app", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/device", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/drivers", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/opengl", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/game", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/support", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/storage", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/interface", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/kernel", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/net", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/mail", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/media", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/midi", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/midi2", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/media", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/interface", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/device", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/app", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/precompiled", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/net", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/opengl", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/storage", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/support", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/translation", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/add-ons/graphics", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/add-ons/input_server", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/add-ons/net_server", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/add-ons/screen_saver", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/add-ons/tracker", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/be_apps/Deskbar", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/be_apps/NetPositive", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/be_apps/Tracker", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/drivers/tty", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/net/netinet", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os/storage", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/os", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/gnu", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/cpp", 0, 0, 0 },\
{ CROSS_INCLUDE_DIR "/bsd", 0, 0, 0 },\
@@ -159,7 +148,7 @@ Boston, MA 02111-1307, USA. */
{ CROSS_INCLUDE_DIR , 0, 0, 0 }, \
{ 0, 0, 0, 0 } \
}
#endif
#endif /* CROSS_DIRECTORY_STRUCTURE */
/* Whee. LIBRARY_PATH is Be's LD_LIBRARY_PATH, which of course will
cause nasty problems if we override it. */

1
gcc/gcc/config/i386/t-haiku
View File

@@ -1,4 +1,3 @@
# There are system headers elsewhere, but these are the ones that
# we are most likely to want to apply any fixes to.
NATIVE_SYSTEM_HEADER_DIR = /boot/develop/headers/posix
CROSS_SYSTEM_HEADER_DIR = $(tooldir)/sys-include/posix