socl_link

commit 0ec9cc972a21c99321fb64ba297cb56b81852e1a
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Sat Oct 24 13:57:10 2020 +0200

    socl: Add missing -lOpenCL, drop unused cuda flag

Gbp-Pq: Name socl_link

diff --git a/socl/src/Makefile.am b/socl/src/Makefile.am
index ee2f3317aff6499f9f6ccb05de7a877a35e75d40..a2dee9c7b78c3defc68e7e670ad25d247c82cb5c 100644 (file)
--- a/socl/src/Makefile.am
+++ b/socl/src/Makefile.am
@@ -19,9 +19,9 @@ include $(top_srcdir)/starpu-notests.mk
 CLEANFILES = *.gcno *.gcda
 
 AM_CFLAGS = $(GLOBAL_AM_CFLAGS) $(STARPU_CUDA_CPPFLAGS) $(STARPU_OPENCL_CPPFLAGS) $(HWLOC_CFLAGS) $(FXT_CFLAGS)
-libsocl_@STARPU_EFFECTIVE_VERSION@_la_LIBADD = $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la
 AM_CPPFLAGS = -DBUILDING_SOCL -I$(top_srcdir)/include/ -I$(top_builddir)/include -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/socl/src
-AM_LDFLAGS = $(STARPU_OPENCL_LDFLAGS) $(STARPU_CUDA_LDFLAGS) $(FXT_LDFLAGS) -no-undefined
+AM_LIBADD = $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la \
+           $(STARPU_OPENCL_LDFLAGS) $(FXT_LDFLAGS)
 
 SUBDIRS =
 
@@ -51,6 +51,7 @@ noinst_HEADERS =                              \
   CL/cl_gl.h                                   \
   CL/opencl.h
 
+libsocl_@STARPU_EFFECTIVE_VERSION@_la_LIBADD = $(AM_LIBADD)
 libsocl_@STARPU_EFFECTIVE_VERSION@_la_LDFLAGS = $(ldflags) -no-undefined                       \
   -version-info $(LIBSOCL_INTERFACE_CURRENT):$(LIBSOCL_INTERFACE_REVISION):$(LIBSOCL_INTERFACE_AGE)