[ompd] - Remove hardcoded RUNPATH from ompdModule.cpython.so.

Use `$ORIGIN` in RUNPATH instead.

Link in libclang-cpp.so to ompdModule.so to
satisfy missing llvm dynamic symbols just like
we do in the cpython version.

Change-Id: Ic38ded1e34bd4e12d47ada47a5e34444662f31f9

Author: estewart08

openmp/libompd/gdb-plugin/CMakeLists.txt

@@ -65,7 +65,7 @@ GET_FILENAME_COMPONENT(CLANG_CPP_PATH "${CLANG_CPP}" PATH)
 
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python-module/ompd/__init__.py
                    DEPENDS ompdModule.c DLSymService.cpp ompdAPITests.c setup.py ompd/frame_filter.py ompd/__init__.py ompd/ompd_address_space.py ompd/ompd_callbacks.py ompd/ompd_handles.py ompd/ompd.py
-		    COMMAND ${CMAKE_COMMAND} -E env LIBOMP_INCLUDE_DIR=${LIBOMP_INCLUDE_DIR} LLVM_MAIN_INCLUDE_DIR=${LLVM_MAIN_INCLUDE_DIR} CLANG_CPP=${CLANG_CPP} INSTALL_LIB_LOC=${CLANG_CPP_PATH}
+		    COMMAND ${CMAKE_COMMAND} -E env LIBOMP_INCLUDE_DIR=${LIBOMP_INCLUDE_DIR} LLVM_MAIN_INCLUDE_DIR=${LLVM_MAIN_INCLUDE_DIR} CLANG_CPP=${CLANG_CPP}
                    ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py -v bdist_wheel -b ${CMAKE_CURRENT_BINARY_DIR}/build -d ${CMAKE_CURRENT_BINARY_DIR}
                    COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py clean --all
                    COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_SOURCE_DIR}/ompd.egg-info
@@ -89,6 +89,7 @@ include_directories (
 
 target_link_libraries (ompdModule ${Python3_LIBRARIES})
 target_link_libraries (ompdModule ${CMAKE_DL_LIBS})
+target_link_libraries (ompdModule ${CLANG_CPP})
 
 set_target_properties (ompdModule PROPERTIES PREFIX "")
 set_target_properties (ompdModule PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/python-module/ompd/")

openmp/libompd/gdb-plugin/setup.py

@@ -10,7 +10,6 @@
 # Needed for dlsym
 clang_cpp = os.environ.get('CLANG_CPP', dir_path)
 clang_cpp_dir = clang_cpp.split('libclang-cpp.so')
-install_lib_loc = os.environ.get('INSTALL_LIB_LOC', dir_path)
 
 print("find_packages : ", find_packages())
 setup(
@@ -19,5 +18,5 @@
     py_modules=['loadompd'],
     setup_requires=['wheel'],
     packages=find_packages(),
-	ext_modules=[Extension('ompd.ompdModule', [dir_path+'/ompdModule.c', dir_path+'/ompdAPITests.c', dir_path+'/DLSymService.cpp'], include_dirs=[omp_include_dir, llvm_include_dir], runtime_library_dirs=[install_lib_loc], libraries=['clang-cpp'], library_dirs=[clang_cpp_dir[0]])]
+    ext_modules=[Extension('ompd.ompdModule', [dir_path+'/ompdModule.c', dir_path+'/ompdAPITests.c', dir_path+'/DLSymService.cpp'], include_dirs=[omp_include_dir, llvm_include_dir], runtime_library_dirs=["$ORIGIN:$ORIGIN/../lib"], libraries=['clang-cpp'], library_dirs=[clang_cpp_dir[0]])]
 )