[llvm-commits] [llvm] r109385 - /llvm/trunk/Makefile.rules

[Nick Lewycky]

NAKAMURA Takumi wrote:
> Nick,
>
> I found this patch was incomplete. the improved one is attached.
>
> with previous patch, the below is enabled on cygwin/mingw.
>> ifneq ($(DARWIN_MAJVERS),4)
>>    LD.Flags += $(RPATH) -Wl, at executable_path/../lib
>> endif
>
> I guess it would be less harmful but I did not forget former patch. XD

Does:

   ifeq (,$(findstring $(HOST_OS),Darwin Cygwin MingW))
     LD.Flags += ...
   endif

work? And do you think that reads more clearly? Elsewhere in the 
makefile, we also have this:

   ifeq ($(HOST_OS), $(filter $(HOST_OS), Linux NetBSD FreeBSD))
   ifneq ($(ARCH), Mips)
     LD.Flags += 
-Wl,--version-script=$(LLVM_SRC_ROOT)/autoconf/ExportMap.map
   endif
   endif

which is why I thought the construct was correct. Should we update this 
one too? Or is there a subtlety I'm missing.

Nick

>
> ...Takumi
>
>
>
> 2010/7/26 Nick Lewycky<nicholas at mxc.ca>:
>> Author: nicholas
>> Date: Sun Jul 25 17:33:04 2010
>> New Revision: 109385
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=109385&view=rev
>> Log:
>> Don't pass -export-dynamic to the linker on Cygwin and MinGW. These platforms
>> accept the flag and do nothing but warn about it, cleverly bypassing our
>> configure-based detection system. Patch by Takumi Nakamura!
>>
>> Modified:
>>     llvm/trunk/Makefile.rules
>>
>> Modified: llvm/trunk/Makefile.rules
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=109385&r1=109384&r2=109385&view=diff
>> ==============================================================================
>> --- llvm/trunk/Makefile.rules (original)
>> +++ llvm/trunk/Makefile.rules Sun Jul 25 17:33:04 2010
>> @@ -618,7 +618,7 @@
>>   endif
>>
>>   # Adjust linker flags for building an executable
>> -ifneq ($(HOST_OS),Darwin)
>> +ifneq ($(HOST_OS), $(filter $(HOST_OS), Darwin Cygwin MingW))
>>   ifdef TOOLNAME
>>    LD.Flags += $(RPATH) -Wl,'$$ORIGIN/../lib'
>>    ifdef EXAMPLE_TOOL
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>>