Add rpath to the library paths instead of state->rpath

Riccardo Schirone committed 4 years ago

Commit 027b8fb1 parent d88857b2 files · +5 −10Browse files

Unified · Split

2 files

 }
 static int tcc_add_library_internal(TCCState *s, const char *fmt,
-    const char *filename, int flags, char **paths, int nb_paths, const char *rpath)
+    const char *filename, int flags, char **paths, int nb_paths)
 {
     char buf[1024];
     int i;
         if (tcc_add_file_internal(s, buf, flags | AFF_TYPE_BIN) == 0)
             return 0;
     }
-    if (rpath) {
-        snprintf(buf, sizeof(buf), fmt, rpath, filename);
-        if (tcc_add_file_internal(s, buf, flags | AFF_TYPE_BIN) == 0)
-            return 0;
-    }
     return -1;
 }
 ST_FUNC int tcc_add_dll(TCCState *s, const char *filename, int flags)
 {
     return tcc_add_library_internal(s, "%s/%s", filename, flags,
-        s->library_paths, s->nb_library_paths, s->rpath);
+        s->library_paths, s->nb_library_paths);
 }
 #endif
 ST_FUNC int tcc_add_crt(TCCState *s1, const char *filename)
 {
     if (-1 == tcc_add_library_internal(s1, "%s/%s",
-        filename, 0, s1->crt_paths, s1->nb_crt_paths, NULL))
+        filename, 0, s1->crt_paths, s1->nb_crt_paths))
         tcc_error_noabort("file '%s' not found", filename);
     return 0;
 }
     int flags = s->filetype & AFF_WHOLE_ARCHIVE;
     while (*pp) {
         if (0 == tcc_add_library_internal(s, *pp,
-            libraryname, flags, s->library_paths, s->nb_library_paths, NULL))
+            libraryname, flags, s->library_paths, s->nb_library_paths))
             return 0;
         ++pp;
     }

@@ -3488,7 +3488,7 @@ ST_FUNC int tcc_load_dll(TCCState s1, int fd, const char filename, int level) · 3487 unmodified lines
3488	if (dt->d_tag == DT_SONAME) {	3488	if (dt->d_tag == DT_SONAME) {
3489	soname = dynstr + dt->d_un.d_val;	3489	soname = dynstr + dt->d_un.d_val;
3490	} else if (dt->d_tag == DT_RPATH) {	3490	} else if (dt->d_tag == DT_RPATH) {
3491	s1->rpath = tcc_strdup(dynstr + dt->d_un.d_val);	3491	tcc_add_library_path(s1, dynstr + dt->d_un.d_val);
3492	}	3492	}
3493	}	3493	}
3494		3494

Keyboard shortcuts