Oops, swap this. This fixes a regression I introduced in the ARM backend.

[oota-llvm.git] / Makefile.rules

diff --git a/Makefile.rules b/Makefile.rules
index 93a01932e7b3b41066a97dadccae73ceb14ffd98..0e586a87f9ca2c785d4c04058c8b46abdc484721 100644 (file)
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -277,6 +277,10 @@ ifeq ($(ENABLE_PIC),0)
 endif
 endif
 
+ifeq ($(ARCH),Alpha)
+  LD.Flags += -Wl,--no-relax
+endif
+
 #--------------------------------------------------------------------
 # Directory locations
 #--------------------------------------------------------------------
@@ -677,8 +681,8 @@ $(LLVM_CONFIG):
         
 $(ToolDir)/$(strip $(TOOLNAME))$(EXEEXT): $(LLVM_CONFIG)
 
-ProjLibsOptions = $(shell $(LLVM_CONFIG) --libs     $(LINK_COMPONENTS))
-ProjLibsPaths   = $(LLVM_CONFIG) \
+ProjLibsOptions += $(shell $(LLVM_CONFIG) --libs     $(LINK_COMPONENTS))
+ProjLibsPaths   += $(LLVM_CONFIG) \
                   $(shell $(LLVM_CONFIG) --libfiles $(LINK_COMPONENTS))
 endif
 endif