Index: tools/lldb-platform/Makefile
===================================================================
--- tools/lldb-platform/Makefile	(revision 155620)
+++ tools/lldb-platform/Makefile	(working copy)
@@ -10,7 +10,7 @@
 
 TOOLNAME = lldb-platform
 
-LD.Flags += -llldb -llldbUtility
+LLVMLibsOptions += -llldb -llldbUtility
 
 include $(LLDB_LEVEL)/Makefile
 
Index: tools/driver/Makefile
===================================================================
--- tools/driver/Makefile	(revision 155620)
+++ tools/driver/Makefile	(working copy)
@@ -10,7 +10,7 @@
 
 TOOLNAME = lldb
 
-LD.Flags += -ledit -llldb -llldbUtility
+LLVMLibsOptions += -llldb -llldbUtility -ledit
 
 include $(LLDB_LEVEL)/Makefile
 
Index: lib/Makefile
===================================================================
--- lib/Makefile	(revision 155620)
+++ lib/Makefile	(working copy)
@@ -126,10 +126,8 @@
     # Include everything from the .a's into the shared library.
     ProjLibsOptions := -Wl,--whole-archive $(ProjLibsOptions) \
                        -Wl,--no-whole-archive
-    # Don't allow unresolved symbols.
-    LLVMLibsOptions += -Wl,--no-undefined
-    # Link in python
-    LD.Flags += $(PYTHON_BUILD_FLAGS) -lrt
+    # Don't allow unresolved symbols. Link in python.
+    LLVMLibsOptions += -Wl,--no-undefined $(PYTHON_BUILD_FLAGS) -lrt
 endif
 
 ifeq ($(HOST_OS),FreeBSD)