summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authormidipix <writeonce@midipix.org>2024-03-04 03:30:06 +0000
committermidipix <writeonce@midipix.org>2024-03-04 03:30:06 +0000
commitceb66bfd8a884d34f3c39483042a7d9cae688317 (patch)
treea9f5c73b0ac1595d2d2efe761d3c1048e4fca682
parent4ffae7b501bb689302926c4de443354986623075 (diff)
downloadslibtool-ceb66bfd8a884d34f3c39483042a7d9cae688317.tar.bz2
slibtool-ceb66bfd8a884d34f3c39483042a7d9cae688317.tar.xz
slbt_exec_link_create_archive(): -disable-static code path no longer needed.
-rw-r--r--src/logic/linkcmd/slbt_linkcmd_archive.c35
1 files changed, 0 insertions, 35 deletions
diff --git a/src/logic/linkcmd/slbt_linkcmd_archive.c b/src/logic/linkcmd/slbt_linkcmd_archive.c
index 9b002f6..9347678 100644
--- a/src/logic/linkcmd/slbt_linkcmd_archive.c
+++ b/src/logic/linkcmd/slbt_linkcmd_archive.c
@@ -22,35 +22,6 @@
#include "slibtool_spawn_impl.h"
#include "slibtool_visibility_impl.h"
-static int slbt_exec_link_create_noop_symlink(
- const struct slbt_driver_ctx * dctx,
- struct slbt_exec_ctx * ectx,
- const char * arfilename)
-{
- struct stat st;
- int fdcwd;
-
- /* fdcwd */
- fdcwd = slbt_driver_fdcwd(dctx);
-
- /* file exists? */
- if (!fstatat(fdcwd,arfilename,&st,AT_SYMLINK_NOFOLLOW))
- return 0;
-
- /* needed? */
- if (errno == ENOENT) {
- if (slbt_create_symlink(
- dctx,ectx,
- "/dev/null",
- arfilename,
- SLBT_SYMLINK_LITERAL))
- return SLBT_NESTED_ERROR(dctx);
- return 0;
- }
-
- return SLBT_SYSTEM_ERROR(dctx,arfilename);
-}
-
static int slbt_exec_link_remove_file(
const struct slbt_driver_ctx * dctx,
struct slbt_exec_ctx * ectx,
@@ -92,12 +63,6 @@ slbt_hidden int slbt_exec_link_create_archive(
char program[PATH_MAX];
char output [PATH_MAX];
- /* -disable-static? */
- if (dctx->cctx->drvflags & SLBT_DRIVER_DISABLE_STATIC)
- if (dctx->cctx->rpath)
- return slbt_exec_link_create_noop_symlink(
- dctx,ectx,arfilename);
-
/* dlopen, dlpreopen: object compilation (derived from dynamic linking) */
if (ectx->dlopenobj) {
slbt_ectx_reset_arguments(ectx);