[haiku-commits] BRANCH HaikuPM-github.package-management [bddca41] src/system/runtime_loader

  • From: HaikuPM-github.package-management <community@xxxxxxxxxxxx>
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Tue, 6 Aug 2013 04:00:33 +0200 (CEST)

added 1 changeset to branch 'refs/remotes/HaikuPM-github/package-management'
old head: d1251475e2aad18836353e1833887171e2ddb632
new head: bddca41824861df4c978b347099dd46ad4b14193
overview: https://github.com/haiku/HaikuPM/compare/d125147...bddca41

----------------------------------------------------------------------------

bddca41: runtime loader: fix secondary arch search paths

                                    [ Ingo Weinhold <ingo_weinhold@xxxxxx> ]

----------------------------------------------------------------------------

Commit:      bddca41824861df4c978b347099dd46ad4b14193
Author:      Ingo Weinhold <ingo_weinhold@xxxxxx>
Date:        Tue Aug  6 01:45:06 2013 UTC

----------------------------------------------------------------------------

1 file changed, 2 insertions(+), 2 deletions(-)
src/system/runtime_loader/elf_load_image.cpp | 4 ++--

----------------------------------------------------------------------------

diff --git a/src/system/runtime_loader/elf_load_image.cpp 
b/src/system/runtime_loader/elf_load_image.cpp
index fd90514..63c4118 100644
--- a/src/system/runtime_loader/elf_load_image.cpp
+++ b/src/system/runtime_loader/elf_load_image.cpp
@@ -529,10 +529,10 @@ load_image(char const* name, image_type type, const char* 
rpath,
        if (type == B_APP_IMAGE) {
                #if __GNUC__ == 2
                        if ((image->abi & B_HAIKU_ABI_MAJOR) == 
B_HAIKU_ABI_GCC_4)
-                               sSearchPathSubDir = "gcc4";
+                               sSearchPathSubDir = "x86";
                #elif __GNUC__ == 4
                        if ((image->abi & B_HAIKU_ABI_MAJOR) == 
B_HAIKU_ABI_GCC_2)
-                               sSearchPathSubDir = "gcc2";
+                               sSearchPathSubDir = "x86_gcc2";
                #endif
        }
 


Other related posts:

  • » [haiku-commits] BRANCH HaikuPM-github.package-management [bddca41] src/system/runtime_loader - HaikuPM-github . package-management