Index: scripts/Makefile
===================================================================
--- scripts/Makefile
+++ scripts/Makefile
@@ -10,6 +10,8 @@
 LLDB_LEVEL := ..
 include $(LLDB_LEVEL)/../../Makefile.config
 
+ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
 DIRS := Python
+endif
 
 include $(LLDB_LEVEL)/Makefile
Index: source/Host/freebsd/Makefile
===================================================================
--- source/Host/freebsd/Makefile
+++ source/Host/freebsd/Makefile
@@ -11,6 +11,6 @@
 LIBRARYNAME := lldbHostFreeBSD
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I/usr/local/include
+CPP.Flags += -I/usr/local/include
 
 include $(LLDB_LEVEL)/Makefile
Index: source/Host/macosx/HostInfoMacOSX.mm
===================================================================
--- source/Host/macosx/HostInfoMacOSX.mm
+++ source/Host/macosx/HostInfoMacOSX.mm
@@ -176,6 +176,7 @@
 bool
 HostInfoMacOSX::ComputePythonDirectory(FileSpec &file_spec)
 {
+#ifndef LLDB_DISABLE_PYTHON
     FileSpec lldb_file_spec;
     if (!GetLLDBPath(lldb::ePathTypeLLDBShlibDir, lldb_file_spec))
         return false;
@@ -201,6 +202,9 @@
     }
     file_spec.SetFile(raw_path, true);
     return true;
+#else
+    return false;
+#endif
 }
 
 bool
Index: source/Host/posix/HostInfoPosix.cpp
===================================================================
--- source/Host/posix/HostInfoPosix.cpp
+++ source/Host/posix/HostInfoPosix.cpp
@@ -172,6 +172,7 @@
 bool
 HostInfoPosix::ComputePythonDirectory(FileSpec &file_spec)
 {
+#ifndef LLDB_DISABLE_PYTHON
     FileSpec lldb_file_spec;
     if (!GetLLDBPath(lldb::ePathTypeLLDBShlibDir, lldb_file_spec))
         return false;
@@ -189,4 +190,7 @@
 
     file_spec.SetFile(raw_path, true);
     return true;
+#else
+    return false;
+#endif
 }
Index: source/Interpreter/Makefile
===================================================================
--- source/Interpreter/Makefile
+++ source/Interpreter/Makefile
@@ -13,12 +13,16 @@
 include $(LLDB_LEVEL)/../../Makefile.config
 
 ifneq ($(HOST_OS),MingW)
+ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
+DO_BUILD_LLDBWrapPython = 1
 BUILT_SOURCES := LLDBWrapPython.cpp
 endif
+endif
 
 include $(LLDB_LEVEL)/Makefile
 -include $(PROJ_OBJ_DIR)/LLDBWrapPython.cpp.d
 
+ifeq ($(DO_BUILD_LLDBWrapPython),1)
 # Drop -Wfour-char-constants,  which we are not currently clean with.
 EXTRA_OPTIONS += -Wno-four-char-constants
 
@@ -41,3 +45,4 @@
 
 clean-local::
 	$(Verb) $(RM) -f LLDBWrapPython.cpp lldb.py
+endif
Index: source/Plugins/Process/FreeBSD/Makefile
===================================================================
--- source/Plugins/Process/FreeBSD/Makefile
+++ source/Plugins/Process/FreeBSD/Makefile
@@ -12,6 +12,6 @@
 BUILD_ARCHIVE = 1
 
 # Extend the include path so we may locate UnwindLLDB.h
-CPPFLAGS += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Utility
+CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Utility
 
 include $(LLDB_LEVEL)/Makefile
Index: source/Plugins/Process/Linux/Makefile
===================================================================
--- source/Plugins/Process/Linux/Makefile
+++ source/Plugins/Process/Linux/Makefile
@@ -12,6 +12,6 @@
 BUILD_ARCHIVE = 1
 
 # Extend the include path so we may locate UnwindLLDB.h
-CPPFLAGS += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Utility
+CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Utility
 
 include $(LLDB_LEVEL)/Makefile
Index: source/Plugins/Process/POSIX/Makefile
===================================================================
--- source/Plugins/Process/POSIX/Makefile
+++ source/Plugins/Process/POSIX/Makefile
@@ -14,19 +14,19 @@
 include $(LLDB_LEVEL)/../../Makefile.config
 
 # Extend the include path so we may locate UnwindLLDB.h
-CPPFLAGS += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Utility
+CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Utility
 
 ifeq ($(HOST_OS),Linux)
-CPPFLAGS += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Process/Linux
+CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Process/Linux
 
 # Disable warning for now as offsetof is used with an index into a structure member array
 # in defining register info tables.
-CPPFLAGS += -Wno-extended-offsetof
+CPP.Flags += -Wno-extended-offsetof
 endif
 
 ifneq (,$(filter $(HOST_OS), FreeBSD GNU/kFreeBSD))
 # Extend the include path so we may locate ProcessMonitor
-CPPFLAGS += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Process/FreeBSD
+CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Process/FreeBSD
 endif
 
 include $(LLDB_LEVEL)/Makefile