[haiku-commits] r40757 - buildtools/branches/package-management/legacy/gcc/gcc/config/i386

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 1 Mar 2011 16:08:25 +0100 (CET)

Author: zooey
Date: 2011-03-01 16:08:25 +0100 (Tue, 01 Mar 2011)
New Revision: 40757
Changeset: http://dev.haiku-os.org/changeset/40757

Modified:
   buildtools/branches/package-management/legacy/gcc/gcc/config/i386/haiku.h
   buildtools/branches/package-management/legacy/gcc/gcc/config/i386/t-haiku
Log:
* adjust header paths to changes by package management

Modified: 
buildtools/branches/package-management/legacy/gcc/gcc/config/i386/haiku.h
===================================================================
--- buildtools/branches/package-management/legacy/gcc/gcc/config/i386/haiku.h   
2011-03-01 08:26:00 UTC (rev 40756)
+++ buildtools/branches/package-management/legacy/gcc/gcc/config/i386/haiku.h   
2011-03-01 15:08:25 UTC (rev 40757)
@@ -350,10 +350,9 @@
 #undef SMALL_STACK
 
 /* For native compiler, use standard Haiku include file search paths
-   rooted in /boot/develop/headers.  For a cross compiler, don't
-   expect the host to use the Haiku directory scheme, and instead look
-   for the Haiku include files relative to TOOL_INCLUDE_DIR.  Yes, we
-   use ANSI string concatenation here (FIXME) */
+   rooted in /boot/system/packages/contents/develop/headers.  For a cross 
+   compiler, don't expect the host to use the Haiku directory scheme, and 
+   instead look for the Haiku include files relative to TOOL_INCLUDE_DIR. */
 
 #ifndef CROSS_COMPILE
 #undef INCLUDE_DEFAULTS
@@ -361,38 +360,36 @@
     { \
     { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },\
     { GCC_INCLUDE_DIR, "GCC", 0, 0 },\
-    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1}, \
-    { "/boot/common/include", 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/game", 0, 0, 0 },\
-    { "/boot/develop/headers/os/interface", 0, 0, 0 },\
-    { "/boot/develop/headers/os/kernel", 0, 0, 0 },\
-    { "/boot/develop/headers/os/locale", 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/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/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/cpp", 0, 1, 1 },\
-    { "/boot/develop/headers/3rdparty", 0, 0, 0 },\
-    { "/boot/develop/headers/bsd", 0, 0, 0 },\
-    { "/boot/develop/headers/glibc", 0, 0, 0 },\
-    { "/boot/develop/headers/posix", 0, 0, 0 },\
-    { "/boot/develop/headers", 0, 0, 0 }, \
+    { "/boot/common/packages/contents/include", 0, 0, 0 },\
+    { "/boot/system/packages/contents/develop/headers/os", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/app", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/device", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/drivers", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/game", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/interface", 0, 0, 1 
},\
+    { "/boot/system/packages/contents/develop/headers/os/kernel", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/locale", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/mail", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/media", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/midi", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/midi2", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/net", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/opengl", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/storage", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/support", 0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/translation", 0, 0, 1 
},\
+    { "/boot/system/packages/contents/develop/headers/os/add-ons/graphics", 0, 
0, 1 },\
+    { 
"/boot/system/packages/contents/develop/headers/os/add-ons/input_server", 0, 0, 
1 },\
+    { 
"/boot/system/packages/contents/develop/headers/os/add-ons/screen_saver", 0, 0, 
1 },\
+    { "/boot/system/packages/contents/develop/headers/os/add-ons/tracker", 0, 
0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/be_apps/Deskbar", 0, 
0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/be_apps/NetPositive", 
0, 0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/os/be_apps/Tracker", 0, 
0, 1 },\
+    { "/boot/system/packages/contents/develop/headers/3rdparty", 0, 0, 0 },\
+    { "/boot/system/packages/contents/develop/headers/bsd", 0, 0, 0 },\
+    { "/boot/system/packages/contents/develop/headers/glibc", 0, 0, 0 },\
+    { "/boot/system/packages/contents/develop/headers/posix", 0, 0, 0 },\
+    { "/boot/system/packages/contents/develop/headers", 0, 0, 0 }, \
     { 0, 0, 0, 0 } \
     };
 #else /* CROSS_COMPILE */
@@ -401,32 +398,30 @@
     { \
     { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },\
     { GCC_INCLUDE_DIR, "GCC", 0, 0 },\
-    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1}, \
-    { 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/game", 0, 0, 0 },\
-    { CROSS_INCLUDE_DIR "/os/interface", 0, 0, 0 },\
-    { CROSS_INCLUDE_DIR "/os/kernel", 0, 0, 0 },\
-    { CROSS_INCLUDE_DIR "/os/locale", 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/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/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 "/cpp", 0, 1, 1 },\
+    { CROSS_INCLUDE_DIR "/os", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/app", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/device", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/drivers", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/game", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/interface", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/kernel", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/locale", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/mail", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/media", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/midi", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/midi2", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/net", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/opengl", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/storage", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/support", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/translation", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/add-ons/graphics", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/add-ons/input_server", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/add-ons/screen_saver", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/add-ons/tracker", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/be_apps/Deskbar", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/be_apps/NetPositive", 0, 0, 1 },\
+    { CROSS_INCLUDE_DIR "/os/be_apps/Tracker", 0, 0, 1 },\
     { CROSS_INCLUDE_DIR "/3rdparty", 0, 0, 0 },\
     { CROSS_INCLUDE_DIR "/bsd", 0, 0, 0 },\
     { CROSS_INCLUDE_DIR "/glibc", 0, 0, 0 },\

Modified: 
buildtools/branches/package-management/legacy/gcc/gcc/config/i386/t-haiku
===================================================================
--- buildtools/branches/package-management/legacy/gcc/gcc/config/i386/t-haiku   
2011-03-01 08:26:00 UTC (rev 40756)
+++ buildtools/branches/package-management/legacy/gcc/gcc/config/i386/t-haiku   
2011-03-01 15:08:25 UTC (rev 40757)
@@ -4,7 +4,7 @@
 
 # There are system headers elsewhere, but these are the ones that
 # we are most likely to want to apply any fixes to.
-SYSTEM_HEADER_DIR = /boot/develop/headers/posix
+SYSTEM_HEADER_DIR = /boot/system/packages/contents/develop/headers/posix
 CROSS_SYSTEM_HEADER_DIR := $(CROSS_SYSTEM_HEADER_DIR)/posix
 
 # Use the system assert.h


Other related posts:

  • » [haiku-commits] r40757 - buildtools/branches/package-management/legacy/gcc/gcc/config/i386 - zooey