diff --git a/tools/Makefile b/tools/Makefile
index a296f818702..7305f6bafeb 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -15,23 +15,20 @@ OPTIONAL_PARALLEL_DIRS := clang
 # NOTE: The tools are organized into five groups of four consisting of one
 # large and three small executables. This is done to minimize memory load
 # in parallel builds.  Please retain this ordering.
-PARALLEL_DIRS := llvm-config  \
-                 opt llvm-as llvm-dis \
+DIRS := llvm-config
+PARALLEL_DIRS := opt llvm-as llvm-dis \
                  llc llvm-ranlib llvm-ar llvm-nm \
                  llvm-ld llvm-prof llvm-link \
 		 lli gccas gccld llvm-extract llvm-db \
 		 bugpoint llvm-bcanalyzer llvm-stub llvmc
 
-
 include $(LEVEL)/Makefile.config
 
-# only build new lto project on Darwin for now
-ifeq ($(OS),Darwin)
-PARALLEL_DIRS += lto
-
-ifdef BINUTILS_INCDIR
-PARALLEL_DIRS += gold
-endif
+ifdef ENABLE_PIC
+  DIRS += lto
+  ifdef BINUTILS_INCDIR
+    DIRS += gold
+  endif
 endif
 
 include $(LEVEL)/Makefile.common
diff --git a/tools/gold/Makefile b/tools/gold/Makefile
index 37a7e4ef7fc..eccffcbda6b 100644
--- a/tools/gold/Makefile
+++ b/tools/gold/Makefile
@@ -21,6 +21,7 @@ BUILD_ARCHIVE = 0
 DONT_BUILD_RELINKED = 1
 
 LINK_COMPONENTS :=
+LIBS += -llto
 
 include $(LEVEL)/Makefile.common
 
diff --git a/tools/lto/Makefile b/tools/lto/Makefile
index 69014d781ff..f0f6da7191a 100644
--- a/tools/lto/Makefile
+++ b/tools/lto/Makefile
@@ -16,12 +16,8 @@ LIBRARYNAME = LTO
 include $(LEVEL)/Makefile.config
 
 LINK_LIBS_IN_SHARED = 1
-ifeq ($(OS),Darwin)
-  SHARED_LIBRARY = 1
-  DONT_BUILD_RELINKED = 1
-else
-  BUILD_ARCHIVE = 1
-endif
+SHARED_LIBRARY = 1
+DONT_BUILD_RELINKED = 1
 
 LINK_COMPONENTS := $(TARGETS_TO_BUILD) ipo scalaropts linker bitreader bitwriter