[vlc-commits] Revert "configure: Do not use -no-undefined with sanitizers on darwin"

[Marvin Scholz]

vlc | branch: master | Marvin Scholz <epirat07 at gmail.com> | Thu Oct  5 19:12:32 2017 +0200| [b37800b83505ee8fb9fdfa49a9712c713fd63989] | committer: Marvin Scholz

Revert "configure: Do not use -no-undefined with sanitizers on darwin"

This reverts commit 76118f582697ef0776f87ca6d69c4048a3fefe02.

It turns out this is actually an issue with libtool, cleaning the flags
when in link mode and removing the sanitizer flag.

It was fixed in libtool a5c6466528c060cc4660ad0319c00740db0e42ba
but there was no release since this fix.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b37800b83505ee8fb9fdfa49a9712c713fd63989
---

 configure.ac                     | 6 ------
 lib/Makefile.am                  | 2 +-
 modules/audio_output/Makefile.am | 2 +-
 modules/common.am                | 2 +-
 modules/hw/vdpau/Makefile.am     | 2 +-
 modules/video_output/Makefile.am | 2 +-
 src/Makefile.am                  | 2 +-
 7 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index b4b731a788..9057500325 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1136,12 +1136,6 @@ AC_CACHE_CHECK([if linker supports -z,defs], [ac_cv_ld_z_defs], [
 ])
 AS_IF([test "${ac_cv_ld_z_defs}" = "no" -o "${with_sanitizer}" != "no"], [VLC_RESTORE_FLAGS])
 
-AM_COND_IF([HAVE_DARWIN], [], [
-  AS_IF([test "${with_sanitizer}" = "no"], [
-    AC_SUBST([LDFLAGS_no_undefined], [-no-undefined])
-  ])
-])
-
 dnl Check for __attribute__((packed))
 AC_CACHE_CHECK([for __attribute__((packed))],
   [ac_cv_c_attribute_packed],
diff --git a/lib/Makefile.am b/lib/Makefile.am
index f0060e17d8..59571d8df5 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -60,7 +60,7 @@ libvlc_la_LIBADD = \
 	../src/libvlccore.la ../compat/libcompat.la $(LIBPTHREAD) $(LIBM)
 libvlc_la_LDFLAGS = \
 	$(LDFLAGS_libvlc) \
-	$(LDFLAGS_no_undefined) \
+	-no-undefined \
 	-version-info 10:0:5 \
 	-export-symbols $(srcdir)/libvlc.sym
 libvlc_la_DEPENDENCIES = libvlc.sym
diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
index 908008311b..4cffed51bb 100644
--- a/modules/audio_output/Makefile.am
+++ b/modules/audio_output/Makefile.am
@@ -42,7 +42,7 @@ libvlc_pulse_la_CPPFLAGS = -DMODULE_STRING=\"pulse\"
 libvlc_pulse_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
 libvlc_pulse_la_LIBADD = $(PULSE_LIBS) $(LTLIBVLCCORE)
 libvlc_pulse_la_LDFLAGS = \
-	$(LDFLAGS_no_undefined) \
+	-no-undefined \
 	-export-symbols-regex ^vlc_pa_ \
 	-version-info 0:0:0
 libpulse_plugin_la_SOURCES = audio_output/pulse.c
diff --git a/modules/common.am b/modules/common.am
index 97ff8f22b3..7d3ce16978 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -30,7 +30,7 @@ AM_LDFLAGS = \
 	-avoid-version -module \
 	-export-symbols-regex ^vlc_entry \
 	-shrext $(LIBEXT) \
-	$(LDFLAGS_no_undefined) \
+	-no-undefined \
 	$(top_builddir)/compat/libcompat.la $(LTLIBVLCCORE) 
 if HAVE_WIN32
 AM_LDFLAGS += $(top_builddir)/modules/module.rc.lo -Wc,-static
diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am
index 6164b88a1b..0c527cf156 100644
--- a/modules/hw/vdpau/Makefile.am
+++ b/modules/hw/vdpau/Makefile.am
@@ -5,7 +5,7 @@ libvlc_vdpau_la_CFLAGS = $(VDPAU_CFLAGS)
 libvlc_vdpau_la_LIBADD = $(X_LIBS) $(X_PRE_LIBS) -lX11 \
 	$(LIBDL) $(LIBPTHREAD)
 libvlc_vdpau_la_LDFLAGS = \
-	$(LDFLAGS_no_undefined) \
+	-no-undefined \
 	-export-symbols-regex ^vdp_ \
 	-version-info 0:0:0
 
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 166eddeb89..b77824944d 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -114,7 +114,7 @@ libvlc_xcb_events_la_SOURCES = \
 libvlc_xcb_events_la_CPPFLAGS = -DMODULE_STRING=\"xcb\"
 libvlc_xcb_events_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
 libvlc_xcb_events_la_LDFLAGS = \
-	$(LDFLAGS_no_undefined) \
+	-no-undefined \
 	-export-symbols-regex ^vlc_xcb_ \
 	-version-info 0:0:0
 libvlc_xcb_events_la_LIBADD = $(XCB_LIBS) $(LTLIBVLCCORE)
diff --git a/src/Makefile.am b/src/Makefile.am
index 42b6235230..87ea540f69 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -462,7 +462,7 @@ endif
 
 libvlccore_la_LDFLAGS = \
 	$(LDFLAGS_libvlccore) \
-	$(LDFLAGS_no_undefined) \
+	-no-undefined \
 	-export-symbols $(srcdir)/libvlccore.sym \
 	-version-info 8:0:0
 libvlccore_la_DEPENDENCIES = libvlccore.sym