diff --git a/Makefile.rules b/Makefile.rules
index 47a5f2c41ca..bc938d1ab19 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -253,8 +253,8 @@ LibTool.Flags := --tag=CXX
 
 #Make Floating point ieee complient on alpha
 ifeq ($(ARCH),Alpha)
-  CXX.Flags     += -mieee
-  CPP.BaseFlags += -mieee
+  CXX.Flags     += -mieee -fPIC
+  CPP.BaseFlags += -mieee -fPIC
 endif
 
 #--------------------------------------------------------------------
@@ -609,7 +609,7 @@ ifeq ($(LLVMLIBS),JIT)
 Link += -dlopen self
 
 # Generic JIT libraries
-JIT_LIBS := LLVMInterpreter LLVMJIT LLVMCodeGen LLVMExecutionEngine
+JIT_LIBS := LLVMInterpreter LLVMJIT LLVMCodeGen.a LLVMExecutionEngine
 
 # You can enable the X86 JIT on a non-X86 host by setting the flag
 # ENABLE_X86_JIT on the make command line. If not, it will still be
diff --git a/lib/CodeGen/Makefile b/lib/CodeGen/Makefile
index e77a53a337d..62ef1ad727d 100644
--- a/lib/CodeGen/Makefile
+++ b/lib/CodeGen/Makefile
@@ -10,6 +10,7 @@
 LEVEL = ../..
 LIBRARYNAME = LLVMCodeGen
 PARALLEL_DIRS = SelectionDAG
+BUILD_ARCHIVE = 1
 
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/llc/Makefile b/tools/llc/Makefile
index 80af5aa9b17..84689cf7183 100644
--- a/tools/llc/Makefile
+++ b/tools/llc/Makefile
@@ -56,7 +56,7 @@ endif
 
 USEDLIBS += \
 	LLVMSelectionDAG \
-	LLVMCodeGen \
+	LLVMCodeGen.a \
 	LLVMTarget.a \
 	LLVMipa.a \
 	LLVMTransforms.a \