Skip to content

Commit

Permalink
Remove ldconfig completely
Browse files Browse the repository at this point in the history
Shouldn't be necessary. Thanks to Andreas Enge for helping me with this.
  • Loading branch information
albinahlback committed Mar 18, 2024
1 parent f1ec31e commit 6fef2c4
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 27 deletions.
6 changes: 0 additions & 6 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ CC:=@CC@
CXX:=@CC@
DLLTOOL:=@DLLTOOL@
LD:=@LD@
LDCONFIG_N:=@LDCONFIG_N@
LN_S:=@LN_S@
M4:=@M4@
MKDIR_P:=@MKDIR_P@
Expand Down Expand Up @@ -429,11 +428,6 @@ MERGED_LOBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(dir)_merged.lo)
$(FLINT_DIR)/$(FLINT_LIB_FULL): $(MERGED_LOBJS)
@echo "Building $(FLINT_LIB_FULL)"
@$(CC) $(CFLAGS) -shared $(EXTRA_SHARED_FLAGS) $(MERGED_LOBJS) -o $(FLINT_LIB_FULL) $(LDFLAGS) $(LIBS)
ifneq ($(FLINT_SOLIB), 0)
ifneq ($(LDCONFIG_N),)
@$(LDCONFIG_N) ./
endif
endif
@$(RM_F) $(FLINT_LIB)
@$(RM_F) $(FLINT_LIB_MAJOR)
@$(LN_S) $(FLINT_LIB_FULL) $(FLINT_LIB)
Expand Down
21 changes: 0 additions & 21 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -623,27 +623,6 @@ case "$host_os" in
;;
esac

AC_MSG_CHECKING(for ldconfig)
LDCONFIG_N=""
case "$build_os" in
linux*android*)
;;
linux* | k*bsd*-gnu | gnu*)
LDCONFIG_N="/sbin/ldconfig -n"
;;
netbsd* | openbsd*)
dnl LDCONFIG_N="/sbin/ldconfig -m"
;;
esac
if test "x$LDCONFIG_N" = "x";
then
ldconfig_res="skipped"
else
ldconfig_res="$LDCONFIG_N"
fi
AC_MSG_RESULT($ldconfig_res)
AC_SUBST(LDCONFIG_N)

dnl FIXME: Improve this check to include more processors.
AC_MSG_CHECKING([if memory is strongly-ordered])
case "$host" in
Expand Down

0 comments on commit 6fef2c4

Please sign in to comment.