[llvm-branch-commits] [llvm] 73c53e6 - build: process the libxml2 library path for embedding

[Hans Wennborg via llvm-branch-commits]

Author: Saleem Abdulrasool
Date: 2020-02-28T12:05:53+01:00
New Revision: 73c53e612aa125a24eb2c75241b2ebbd560b85c7

URL: https://github.com/llvm/llvm-project/commit/73c53e612aa125a24eb2c75241b2ebbd560b85c7
DIFF: https://github.com/llvm/llvm-project/commit/73c53e612aa125a24eb2c75241b2ebbd560b85c7.diff

LOG: build: process the libxml2 library path for embedding

Process the path for libxml2 before embedding that into the command line
that is generated in `llvm-config`.  Each element in the path is being
given a `-l` unconditionally which should not be the case for absolute
paths.  Since the library path may be absolute or not, just apply some
CMake pre-processing when generating the path.

Before:
```
/usr/lib/x86_64-linux-gnu/libz.so -lrt -ldl -ltinfo -lpthread -lm /usr/lib/x86_64-linux-gnu/libxml2.so
```

After:
```
/usr/lib/x86_64-linux-gnu/libz.so -lrt -ldl -ltinfo -lpthread -lm -lxml2
```

Resolves PR44179!

(cherry picked from commit c3595d1069277b4ab0df49d7139b6f1bbc94f21c)

Added: 
    

Modified: 
    llvm/lib/WindowsManifest/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/llvm/lib/WindowsManifest/CMakeLists.txt b/llvm/lib/WindowsManifest/CMakeLists.txt
index fe6ddcd414d5..8cfea1282ad6 100644
--- a/llvm/lib/WindowsManifest/CMakeLists.txt
+++ b/llvm/lib/WindowsManifest/CMakeLists.txt
@@ -7,6 +7,15 @@ add_llvm_component_library(LLVMWindowsManifest
 
 if(LIBXML2_LIBRARIES)
   target_link_libraries(LLVMWindowsManifest PUBLIC ${LIBXML2_LIBRARIES})
+
+  get_filename_component(xml2_library ${LIBXML2_LIBRARIES} NAME)
+  if(xml2_library MATCHES "^${CMAKE_STATIC_LIBRARY_PREFIX}.*${CMAKE_STATIC_LIBRARY_SUFFIX}$")
+    string(REGEX REPLACE "^${CMAKE_STATIC_LIBRARY_PREFIX}" "" xml2_library ${xml2_library})
+    string(REGEX REPLACE "${CMAKE_STATIC_LIBRARY_SUFFIX}$" "" xml2_library ${xml2_library})
+  elseif(xml2_library MATCHES "^${CMAKE_SHARED_LIBRARY_PREFIX}.*${CMAKE_SHARED_LIBRARY_SUFFIX}$")
+    string(REGEX REPLACE "^${CMAKE_SHARED_LIBRARY_PREFIX}" "" xml2_library ${xml2_library})
+    string(REGEX REPLACE "${CMAKE_SHARED_LIBRARY_SUFFIX}$" "" xml2_library ${xml2_library})
+  endif()
   set_property(TARGET LLVMWindowsManifest PROPERTY
-    LLVM_SYSTEM_LIBS ${LIBXML2_LIBRARIES})
+    LLVM_SYSTEM_LIBS ${xml2_library})
 endif()