diff options
| author | Nick Lewycky <nicholas@mxc.ca> | 2009-03-07 22:17:05 +0000 |
|---|---|---|
| committer | Nick Lewycky <nicholas@mxc.ca> | 2009-03-07 22:17:05 +0000 |
| commit | f653c2e18eed1c9d92d14387fdb890032c6fc7c2 (patch) | |
| tree | d57b80fc1b31a920366429567c3928d0e43ed6f7 /llvm | |
| parent | 16d5d291ecec808d21a4a0cd0b4846754abb0585 (diff) | |
| download | bcm5719-llvm-f653c2e18eed1c9d92d14387fdb890032c6fc7c2.tar.gz bcm5719-llvm-f653c2e18eed1c9d92d14387fdb890032c6fc7c2.zip | |
Revert r66315. Fix the build on mixed 64/32 Linux systems.
llvm-svn: 66350
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/Makefile.rules | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/llvm/Makefile.rules b/llvm/Makefile.rules index 15bc2decf9b..9b8a84f304c 100644 --- a/llvm/Makefile.rules +++ b/llvm/Makefile.rules @@ -458,9 +458,9 @@ endif 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 @@ ifdef UNIVERSAL # 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) |
