Skip to content

Commit f034c25

Browse files
committed
build: Remove workaround for -F in Qt linker flags on macOS.
* m4/acinclude.m4 (OCTAVE_CHECK_QT_VERSION): It doesn't seem to be necessary to link all dependencies with Qt on macOS any longer. Remove work-around that dates back to January 2014. * configure.ac (link-all-dependencies): Adjust documentation.
1 parent 0f730ee commit f034c25

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ case $host_os in
690690
esac
691691
AC_ARG_ENABLE([link-all-dependencies],
692692
[AS_HELP_STRING([--enable-link-all-dependencies],
693-
[link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems). This is done by default for cygwin* or darwin* hosts.])],
693+
[link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems). This is done by default for cygwin* hosts.])],
694694
[case $enableval in
695695
yes) link_all_deps=yes ;;
696696
no) link_all_deps=no ;;

m4/acinclude.m4

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2109,12 +2109,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_MSG_CHECKING([Qt version $1])
21092109
if test -z "$QT_LIBS"; then
21102110
QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`"
21112111
QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`"
2112-
## Enabling link_all_deps works around libtool's imperfect handling
2113-
## of the -F flag
2114-
if test -n "$QT_LDFLAGS"; then
2115-
link_all_deps=yes
2116-
fi
2117-
AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], [test $link_all_deps = yes])
21182112
fi
21192113
;;
21202114
esac

0 commit comments

Comments
 (0)