[Libreoffice-commits] core.git: opencl/Library_opencl.mk

[Stephan Bergmann]

 opencl/Library_opencl.mk |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9c711f05fa10dc70e4257a1f48d43f539353541a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Jul 12 10:31:55 2016 +0200

    Remove bogus dependency from opencl to configmgr
    
    Since f41eb66302208f384a475fb20c98b6d1b0676cb6 "opencl: OpenCLZone, detect CL
    device change and disable CL on crash" vcl links against opencl (so indirectly
    linked against configmgr), which caused CppunitTest_configmgr_unit to include
    the configmgr object files both statically (through
    gb_CppunitTest_use_library_objects) and through the linked-in configmgr dynamic
    library, which in turn caused ASan builds to report an ODR violation for a
    doubly defined 'typeinfo name for configmgr::Access'.
    
    Change-Id: I9ae8637ac02c116dd2d03017f2ebb4004f4b14ad

diff --git a/opencl/Library_opencl.mk b/opencl/Library_opencl.mk
index 039ec01..5b3de52 100644
--- a/opencl/Library_opencl.mk
+++ b/opencl/Library_opencl.mk
@@ -34,7 +34,6 @@ $(eval $(call gb_Library_use_custom_headers,opencl,\
 $(eval $(call gb_Library_use_sdk_api,opencl))
 
 $(eval $(call gb_Library_use_libraries,opencl,\
-    configmgr \
     comphelper \
     cppu \
     sal \