summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2001-05-30 07:07:14 +0000
committerManuel Novoa III <mjn3@codepoet.org>2001-05-30 07:07:14 +0000
commitd75f418d41de68c8c6b840b8335841bf6b8ee038 (patch)
tree12c0322da6fa5d8e7df6121142a6ac9481598a45
parent127e6e3b319280c6938d8a494655d0e932d3ec66 (diff)
Look's like I need to disable the rpath stuff for now as well.
To build with an uninstaled uClibc, set UCLIBC_GCC=build in your env, or rename it/symlink to it using a name containing the string "build".
-rw-r--r--extra/gcc-uClibc/gcc-uClibc.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/extra/gcc-uClibc/gcc-uClibc.c b/extra/gcc-uClibc/gcc-uClibc.c
index abcd3971a..9c6cec3eb 100644
--- a/extra/gcc-uClibc/gcc-uClibc.c
+++ b/extra/gcc-uClibc/gcc-uClibc.c
@@ -51,6 +51,7 @@
#include "gcc-uClibc.h"
+#if 0
static char *rpath_link[] = {
"-Wl,-rpath-link,"UCLIBC_INSTALL_DIR"lib",
"-Wl,-rpath-link,"UCLIBC_BUILD_DIR"lib"
@@ -60,6 +61,7 @@ static char *rpath[] = {
"-Wl,-rpath,"UCLIBC_INSTALL_DIR"lib",
"-Wl,-rpath,"UCLIBC_BUILD_DIR"lib"
};
+#endif
static char *uClibc_inc[] = {
"-I"UCLIBC_INSTALL_DIR"usr/include/",
@@ -193,11 +195,15 @@ int main(int argc, char **argv)
gcc_argv[i++] = dlstr;
#endif
}
+#if 0
if (use_build_dir || use_rpath) {
gcc_argv[i++] = rpath[use_build_dir];
}
+#endif
}
+#if 0
gcc_argv[i++] = rpath_link[use_build_dir]; /* just to be safe */
+#endif
gcc_argv[i++] = lib_path[use_build_dir];
if (!use_build_dir) {
gcc_argv[i++] = usr_lib_path;