diff --git a/Makefile.am b/Makefile.am index e9679e68532d39e0b383df8c14344996d7a2741c..58a5c5960b65b8405fd7ca3e12c896b92136c305 100644 --- a/Makefile.am +++ b/Makefile.am @@ -74,7 +74,7 @@ libweston_@LIBWESTON_MAJOR@_la_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON libweston_@LIBWESTON_MAJOR@_la_CFLAGS = $(AM_CFLAGS) \ $(COMPOSITOR_CFLAGS) $(EGL_CFLAGS) $(LIBUNWIND_CFLAGS) $(LIBDRM_CFLAGS) libweston_@LIBWESTON_MAJOR@_la_LIBADD = $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ - $(DLOPEN_LIBS) -lm $(CLOCK_GETTIME_LIBS) \ + $(DL_LIBS) -lm $(CLOCK_GETTIME_LIBS) \ $(LIBINPUT_BACKEND_LIBS) libshared.la libweston_@LIBWESTON_MAJOR@_la_LDFLAGS = -version-info $(LT_VERSION_INFO) @@ -194,7 +194,7 @@ weston_CPPFLAGS = $(AM_CPPFLAGS) -DIN_WESTON \ weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) weston_LDADD = libshared.la libweston-@LIBWESTON_MAJOR@.la \ $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ - $(DLOPEN_LIBS) $(LIBINPUT_BACKEND_LIBS) \ + $(DL_LIBS) $(LIBINPUT_BACKEND_LIBS) \ $(CLOCK_GETRES_LIBS) \ -lm diff --git a/configure.ac b/configure.ac index f7ec2c941694b589adb4d94e7f17a937b0236518..1aca3d42cacb80b1500f5df664969b88598a2446 100644 --- a/configure.ac +++ b/configure.ac @@ -86,7 +86,8 @@ AC_ARG_VAR([WESTON_SHELL_CLIENT], PKG_PROG_PKG_CONFIG() -WESTON_SEARCH_LIBS([DLOPEN], [dl], [dlopen]) +# Check for dlsym instead of dlopen because ASAN hijacks the latter +WESTON_SEARCH_LIBS([DL], [dl], [dlsym]) # In old glibc versions (< 2.17) clock_gettime() and clock_getres() are in librt WESTON_SEARCH_LIBS([CLOCK_GETTIME], [rt], [clock_gettime])