Author: bonefish Date: 2010-04-19 17:35:39 +0200 (Mon, 19 Apr 2010) New Revision: 36354 Changeset: http://dev.haiku-os.org/changeset/36354/haiku Ticket: http://dev.haiku-os.org/ticket/5630 Modified: buildtools/trunk/gcc/gcc/config/haiku.h buildtools/trunk/legacy/gcc/gcc/config/i386/haiku.h Log: The "cpp" header directory should only be included in C++ mode. Should fix #5630 once the gcc optional packages have been rebuilt. Modified: buildtools/trunk/gcc/gcc/config/haiku.h =================================================================== --- buildtools/trunk/gcc/gcc/config/haiku.h 2010-04-19 15:23:51 UTC (rev 36353) +++ buildtools/trunk/gcc/gcc/config/haiku.h 2010-04-19 15:35:39 UTC (rev 36354) @@ -112,7 +112,7 @@ { "/boot/develop/headers/os/be_apps/Deskbar", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/os/be_apps/NetPositive", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/os/be_apps/Tracker", 0, 0, 0, 0, 0 }, \ - { "/boot/develop/headers/cpp", 0, 0, 0, 0, 0 }, \ + { "/boot/develop/headers/cpp", 0, 1, 1, 0, 0 }, \ { "/boot/develop/headers/3rdparty", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/bsd", 0, 0, 0, 0, 0 }, \ { "/boot/develop/headers/glibc", 0, 0, 0, 0, 0 }, \ @@ -154,7 +154,7 @@ { CROSS_INCLUDE_DIR "/os/be_apps/Deskbar", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/os/be_apps/NetPositive", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/os/be_apps/Tracker", 0, 0, 0, 1, 0 }, \ - { CROSS_INCLUDE_DIR "/cpp", 0, 0, 0, 1, 0 }, \ + { CROSS_INCLUDE_DIR "/cpp", 0, 1, 1, 1, 0 }, \ { CROSS_INCLUDE_DIR "/3rdparty", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/bsd", 0, 0, 0, 1, 0 }, \ { CROSS_INCLUDE_DIR "/glibc", 0, 0, 0, 1, 0 }, \ Modified: buildtools/trunk/legacy/gcc/gcc/config/i386/haiku.h =================================================================== --- buildtools/trunk/legacy/gcc/gcc/config/i386/haiku.h 2010-04-19 15:23:51 UTC (rev 36353) +++ buildtools/trunk/legacy/gcc/gcc/config/i386/haiku.h 2010-04-19 15:35:39 UTC (rev 36354) @@ -387,7 +387,7 @@ { "/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, 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 },\ @@ -426,7 +426,7 @@ { 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, 0, 0 },\ + { CROSS_INCLUDE_DIR "/cpp", 0, 1, 1 },\ { CROSS_INCLUDE_DIR "/3rdparty", 0, 0, 0 },\ { CROSS_INCLUDE_DIR "/bsd", 0, 0, 0 },\ { CROSS_INCLUDE_DIR "/glibc", 0, 0, 0 },\