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

[Nick Lewycky]

Evan Cheng wrote:
> On Mar 7, 2009, at 2:17 PM, Nick Lewycky wrote:
> 
>> Author: nicholas
>> Date: Sat Mar  7 16:17:05 2009
>> New Revision: 66350
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=66350&view=rev
>> Log:
>> Revert r66315. Fix the build on mixed 64/32 Linux systems.
>>
>> Modified:
>>   llvm/trunk/Makefile.rules
>>
>> Modified: llvm/trunk/Makefile.rules
>> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile.rules?rev=66350&r1=66349&r2=66350&view=diff
>>
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> =
>> ======================================================================
>> --- llvm/trunk/Makefile.rules (original)
>> +++ llvm/trunk/Makefile.rules Sat Mar  7 16:17:05 2009
>> @@ -458,9 +458,9 @@
>> ifneq ($(OS),Darwin)
>> ifdef TOOLNAME
>> ifdef EXAMPLE_TOOL
>> -  LD.Flags += $(RPATH) -Wl,$(ExmplDir) -export-dynamic
>> +  LD.Flags += $(RPATH) -Wl,$(ExmplDir) $(RDYNAMIC)
>> else
>> -  LD.Flags += $(RPATH) -Wl,$(ToolDir) -export-dynamic
>> +  LD.Flags += $(RPATH) -Wl,$(ToolDir) $(RDYNAMIC)
> 
> This wasn't part of 66315.

Oops, you're right.

Uhm, I thought I had committed that change a long while ago. If you 
don't mind I guess I'll just leave it in, since it's supposed to be 
there :-/

Nick

> 
> Evan
> 
>> endif
>> endif
>> endif
>> @@ -516,14 +516,6 @@
>>
>>  # Building universal cannot compute dependencies automatically.
>>  DISABLE_AUTO_DEPENDENCIES=1
>> -else
>> -  ifeq ($(ARCH),x86_64)
>> -    CompileCommonOpts += -m64
>> -  else
>> -    ifeq ($(ARCH),i386)
>> -      CompileCommonOpts += -m32
>> -    endif
>> -  endif
>> endif
>>
>> ifeq ($(OS),SunOS)
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>