⛏️ index : buildtools.git

5998536b290102598dbd9e5232f5069a9b0ebe46 [patch]

91649be67912b0ebc1ba9b590574e37a153ea145

1ae0d67acc26c404345c7f3cdaabb0fdc3e0ae9c

5998536b290102598dbd9e5232f5069a9b0ebe46.tar.gz

The "cpp" header directory should only be included in C++ mode. Should fix #5630 once the gcc optional packages have been rebuilt.

git-svn-id: file:///srv/svn/repos/haiku/buildtools/trunk@36354 a95241bf-73f2-0310-859d-f6bbb57e9c96

Diff

 gcc/gcc/config/haiku.h             | 4 +++-
 legacy/gcc/gcc/config/i386/haiku.h | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/gcc/config/haiku.h b/gcc/gcc/config/haiku.h
index a9aa67c..798e325 100644
--- a/gcc/gcc/config/haiku.h
+++ b/gcc/gcc/config/haiku.h
@@ -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 }, \
diff --git a/legacy/gcc/gcc/config/i386/haiku.h b/legacy/gcc/gcc/config/i386/haiku.h
index 558a8e4..faa2ea4 100644
--- a/legacy/gcc/gcc/config/i386/haiku.h
+++ b/legacy/gcc/gcc/config/i386/haiku.h
@@ -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 },\