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 | 34d7455ebccc52ed739135829cd74fe12c64c2e6 (patch) | |
| tree | 9586b9e2979a5845e4c10b7fbdfcbb2e70fbea04 /Makefile.rules | |
| parent | 0acf6b00f3f5728952a257f98fd45e84a0ece23c (diff) | |
Revert r66315. Fix the build on mixed 64/32 Linux systems.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66350 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'Makefile.rules')
| -rw-r--r-- | Makefile.rules | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/Makefile.rules b/Makefile.rules index 15bc2decf9..9b8a84f304 100644 --- a/Makefile.rules +++ b/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) |