Browse Source

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".

Manuel Novoa III 24 years ago
parent
commit
d75f418d41
1 changed files with 6 additions and 0 deletions
  1. 6 0
      extra/gcc-uClibc/gcc-uClibc.c

+ 6 - 0
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;