<div dir="ltr">That's fine, thanks for working so quickly to fix. Both of them are OK for 3.5.x.<div><br></div><div>-eric</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Sep 10, 2014 at 11:55 AM, Dan Liew <span dir="ltr"><<a href="mailto:dan@su-root.co.uk" target="_blank">dan@su-root.co.uk</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Tom,<br>
<br>
This is one of two patches that it would be good to have in a 3.5.x<br>
release. Unfortunately this patch is slightly broken because it<br>
prevents make clean from being run which was picked up by the<br>
buildbots. r217490 fixes this.<br>
<br>
Eric Christopher gave approval for this patch in [1] but I did not get<br>
approval for r217490 because I wanted to fix the buildbots as quickly<br>
as possible.<br>
<br>
[1] <a href="http://lists.cs.uiuc.edu/pipermail/llvmdev/2014-September/076609.html" target="_blank">http://lists.cs.uiuc.edu/pipermail/llvmdev/2014-September/076609.html</a><br>
<div class="HOEnZb"><div class="h5"><br>
On 10 September 2014 11:18, Dan Liew <<a href="mailto:dan@su-root.co.uk">dan@su-root.co.uk</a>> wrote:<br>
> Author: delcypher<br>
> Date: Wed Sep 10 05:18:59 2014<br>
> New Revision: 217484<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=217484&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=217484&view=rev</a><br>
> Log:<br>
> Attempt to fix PR20884<br>
><br>
> This fixes the generation of broken LLVMExports.cmake file by<br>
> the Autoconf/Makefile build system when --enable-shared is passed to<br>
> configure.<br>
><br>
> When --enable_shared is passed the Makefile.rules does not set the<br>
> LLVMConfigLibs variable which cmake/modules/Makefile previously relied<br>
> on. Now it runs the llvm-config command itself to get the library names.<br>
><br>
> This still isn't perfect because the generated LLVM targets refer to the<br>
> static libraries and not the shared library but that is much larger<br>
> problem to fix.<br>
><br>
> Modified:<br>
> llvm/trunk/cmake/modules/Makefile<br>
><br>
> Modified: llvm/trunk/cmake/modules/Makefile<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/Makefile?rev=217484&r1=217483&r2=217484&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/Makefile?rev=217484&r1=217483&r2=217484&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/cmake/modules/Makefile (original)<br>
> +++ llvm/trunk/cmake/modules/Makefile Wed Sep 10 05:18:59 2014<br>
> @@ -33,6 +33,16 @@ else<br>
> LLVM_ENABLE_RTTI := 0<br>
> endif<br>
><br>
> +LLVM_LIBS_TO_EXPORT := $(subst -l,,$(shell $(LLVM_CONFIG) --libs $(LINK_COMPONENTS) || echo Error))<br>
> +<br>
> +ifeq ($(LLVM_LIBS_TO_EXPORT),Error)<br>
> +$(error llvm-config --libs failed)<br>
> +endif<br>
> +<br>
> +ifndef LLVM_LIBS_TO_EXPORT<br>
> +$(error LLVM_LIBS_TO_EXPORT cannot be empty)<br>
> +endif<br>
> +<br>
> OBJMODS := LLVMConfig.cmake LLVMConfigVersion.cmake LLVMExports.cmake<br>
><br>
> $(PROJ_OBJ_DIR)/LLVMConfig.cmake: <a href="http://LLVMConfig.cmake.in" target="_blank">LLVMConfig.cmake.in</a> $(LLVMBuildCMakeFrag)<br>
> @@ -45,7 +55,7 @@ $(PROJ_OBJ_DIR)/LLVMConfig.cmake: LLVMCo<br>
> -e 's/@LLVM_VERSION_PATCH@/'"$(LLVM_VERSION_PATCH)"'/' \<br>
> -e 's/@PACKAGE_VERSION@/'"$(LLVMVersion)"'/' \<br>
> -e 's/@LLVM_COMMON_DEPENDS@//' \<br>
> - -e 's/@LLVM_AVAILABLE_LIBS@/'"$(subst -l,,$(LLVMConfigLibs))"'/' \<br>
> + -e 's/@LLVM_AVAILABLE_LIBS@/'"$(LLVM_LIBS_TO_EXPORT)"'/' \<br>
> -e 's/@LLVM_ALL_TARGETS@/'"$(ALL_TARGETS)"'/' \<br>
> -e 's/@LLVM_TARGETS_TO_BUILD@/'"$(TARGETS_TO_BUILD)"'/' \<br>
> -e 's/@LLVM_TARGETS_WITH_JIT@/'"$(TARGETS_WITH_JIT)"'/' \<br>
> @@ -83,7 +93,7 @@ $(PROJ_OBJ_DIR)/LLVMExports.cmake: $(LLV<br>
> $(Echo) 'Generating LLVM CMake target exports file'<br>
> $(Verb) ( \<br>
> echo '# LLVM CMake target exports. Do not include directly.' && \<br>
> - for lib in $(subst -l,,$(LLVMConfigLibs)); do \<br>
> + for lib in $(LLVM_LIBS_TO_EXPORT); do \<br>
> echo 'add_library('"$$lib"' STATIC IMPORTED)' && \<br>
> echo 'set_property(TARGET '"$$lib"' PROPERTY IMPORTED_LOCATION "'"$(PROJ_libdir)/lib$$lib.a"'")' ; \<br>
> done && \<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<br>
<br>
<br>
</div></div><span class="HOEnZb"><font color="#888888">--<br>
Dan Liew<br>
PhD Student - Imperial College London<br>
</font></span></blockquote></div><br></div>