From 77e4679aec7196a8abb99362a456850591d2062d Mon Sep 17 00:00:00 2001
From: Henry Kroll III <henry@comptune.com>
Date: Thu, 25 Nov 2010 10:08:58 -0800
Subject: [PATCH] x86_64: finish biarch path fixup

---
 libtcc.c | 2 +-
 tccelf.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libtcc.c b/libtcc.c
index f1c3fa2f..61379bc6 100644
--- a/libtcc.c
+++ b/libtcc.c
@@ -962,7 +962,7 @@ LIBTCCAPI TCCState *tcc_new(void)
 #ifndef TCC_TARGET_PE
     /* default library paths */
     tcc_add_library_path(s, CONFIG_TCC_CRT_PREFIX);
-    tcc_add_library_path(s, CONFIG_TCC_LDDIR);
+    tcc_add_library_path(s, CONFIG_SYSROOT CONFIG_TCC_LDDIR);
     tcc_add_library_path(s, CONFIG_SYSROOT "/usr/local"CONFIG_TCC_LDDIR);
 #endif
 
diff --git a/tccelf.c b/tccelf.c
index a1ecf955..21a14d5f 100644
--- a/tccelf.c
+++ b/tccelf.c
@@ -1251,7 +1251,7 @@ ST_FUNC void tcc_add_runtime(TCCState *s1)
     if (!s1->nostdlib) {
 #ifdef CONFIG_USE_LIBGCC
         tcc_add_library(s1, "c");
-        tcc_add_file(s1, CONFIG_TCC_LDDIR"/libgcc_s.so.1");
+        tcc_add_file(s1, CONFIG_SYSROOT CONFIG_TCC_LDDIR"/libgcc_s.so.1");
 #else
         tcc_add_library(s1, "c");
 #ifndef WITHOUT_LIBTCC
-- 
2.11.4.GIT