Mercurial > hg > aboriginal
changeset 63:89cf9497824e
Teach the native build about ld-uClibc.so.0 can living in /tools.
| author | Rob Landley <rob@landley.net> |
|---|---|
| date | Mon, 25 Dec 2006 20:13:08 -0500 |
| parents | 4125b672b00c |
| children | 51b8220c37e7 |
| files | mini-native.sh sources/toys/gcc-uClibc.c |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mini-native.sh Mon Dec 25 19:05:11 2006 -0500 +++ b/mini-native.sh Mon Dec 25 20:13:08 2006 -0500 @@ -6,6 +6,9 @@ TOOLS="${NATIVE}/tools" mkdir -p "${TOOLS}/bin" || dienow +# Tell the wrapper script where to find the dynamic linker. +export UCLIBC_DYNAMIC_LINKER=/tools/lib/ld-uClibc.so.0 + # Purple. And why not? echo -e "\e[35m"
--- a/sources/toys/gcc-uClibc.c Mon Dec 25 19:05:11 2006 -0500 +++ b/sources/toys/gcc-uClibc.c Mon Dec 25 20:13:08 2006 -0500 @@ -195,8 +195,9 @@ asprintf(our_lib_path, "-L%s/lib", devprefix); // Figure out where the dynamic linker is. - dlstr = getenv("UCLIBC_GCC_DLOPT"); - if (!dlstr) dlstr = "-Wl,--dynamic-linker,/lib/ld-uClibc.so.0"; + dlstr = getenv("UCLIBC_DYNAMIC_LINKER"); + if (!dlstr) dlstr = "/lib/ld-uClibc.so.0"; + asprintf(&dlstr, "-Wl,--dynamic-linker,%s", dlstr); liblen = 0; libraries = __builtin_alloca(sizeof(char*) * (argc));