Skip to content

Commit 7d72965

Browse files
authored
Merge pull request #1847 from albinahlback/remove_ldconfig
Remove ldconfig completely
2 parents b761a02 + f8f0f6a commit 7d72965

File tree

2 files changed

+0
-27
lines changed

2 files changed

+0
-27
lines changed

Makefile.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ CC:=@CC@
4848
CXX:=@CC@
4949
DLLTOOL:=@DLLTOOL@
5050
LD:=@LD@
51-
LDCONFIG_N:=@LDCONFIG_N@
5251
LN_S:=@LN_S@
5352
M4:=@M4@
5453
MKDIR_P:=@MKDIR_P@
@@ -404,11 +403,6 @@ MERGED_LOBJS:=$(foreach dir, $(DIRS),$(BUILD_DIR)/$(dir)_merged.lo)
404403
$(FLINT_DIR)/$(FLINT_LIB_FULL): $(MERGED_LOBJS)
405404
@echo "Building $(FLINT_LIB_FULL)"
406405
@$(CC) $(CFLAGS) -shared $(EXTRA_SHARED_FLAGS) $(MERGED_LOBJS) -o $(FLINT_LIB_FULL) $(LDFLAGS) $(LIBS)
407-
ifneq ($(FLINT_SOLIB), 0)
408-
ifneq ($(LDCONFIG_N),)
409-
@$(LDCONFIG_N) ./
410-
endif
411-
endif
412406
@$(RM_F) $(FLINT_LIB)
413407
@$(RM_F) $(FLINT_LIB_MAJOR)
414408
@$(LN_S) $(FLINT_LIB_FULL) $(FLINT_LIB)

configure.ac

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -841,27 +841,6 @@ case "$host_os" in
841841
;;
842842
esac
843843

844-
AC_MSG_CHECKING(for ldconfig)
845-
LDCONFIG_N=""
846-
case "$build_os" in
847-
linux*android*)
848-
;;
849-
linux* | k*bsd*-gnu | gnu*)
850-
LDCONFIG_N="/sbin/ldconfig -n"
851-
;;
852-
netbsd* | openbsd*)
853-
dnl LDCONFIG_N="/sbin/ldconfig -m"
854-
;;
855-
esac
856-
if test "x$LDCONFIG_N" = "x";
857-
then
858-
ldconfig_res="skipped"
859-
else
860-
ldconfig_res="$LDCONFIG_N"
861-
fi
862-
AC_MSG_RESULT($ldconfig_res)
863-
AC_SUBST(LDCONFIG_N)
864-
865844
dnl FIXME: Improve this check to include more processors.
866845
AC_MSG_CHECKING([if memory is strongly-ordered])
867846
case "$host" in

0 commit comments

Comments
 (0)