From c966de06461b328dc67d43be1535cc20acf836f7 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Thu, 22 Apr 2010 15:49:01 +0000 Subject: [PATCH] Changed the behavior to always display the GCC. Extended it to report "Hybrid" as needed. "Hybrid" is a new string for localization. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36419 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/aboutsystem/AboutSystem.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/apps/aboutsystem/AboutSystem.cpp b/src/apps/aboutsystem/AboutSystem.cpp index 6bc18fba35..e54ca0bfb2 100644 --- a/src/apps/aboutsystem/AboutSystem.cpp +++ b/src/apps/aboutsystem/AboutSystem.cpp @@ -492,13 +492,16 @@ AboutView::AboutView() B_ALIGN_VERTICAL_UNSET)); // GCC version -#if __GNUC__ != 2 - snprintf(string, sizeof(string), "GCC %d", __GNUC__); + BEntry gccFourHybrid("/boot/system/lib/gcc2/libstdc++.r4.so"); + BEntry gccTwoHybrid("/boot/system/lib/gcc4/libsupc++.so"); + if (gccFourHybrid.Exists() || gccTwoHybrid.Exists()) + snprintf(string, sizeof(string), TR("GCC %d Hybrid"), __GNUC__); + else + snprintf(string, sizeof(string), "GCC %d", __GNUC__); BStringView* gccView = new BStringView("gcctext", string); gccView->SetExplicitAlignment(BAlignment(B_ALIGN_LEFT, B_ALIGN_VERTICAL_UNSET)); -#endif // CPU count, type and clock speed char processorLabel[256]; @@ -560,9 +563,7 @@ AboutView::AboutView() .AddGroup(B_VERTICAL) .Add(_CreateLabel("oslabel", TR("Version:"))) .Add(versionView) -#if __GNUC__ != 2 .Add(gccView) -#endif .AddStrut(offset) .Add(_CreateLabel("cpulabel", processorLabel)) .Add(cpuView)