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

[Nick Lewycky]

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)
 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)