7 files changed, 20 insertions, 8 deletions
diff --git a/lldb/source/Host/freebsd/Makefile b/lldb/source/Host/freebsd/Makefile
index 4484ee2e48d..d4d848dc430 100644
--- a/lldb/source/Host/freebsd/Makefile
+++ b/lldb/source/Host/freebsd/Makefile
@@ -11,6 +11,6 @@ LLDB_LEVEL := ../../..
 LIBRARYNAME := lldbHostFreeBSD
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I/usr/local/include
+CPP.Flags += -I/usr/local/include
 
 include $(LLDB_LEVEL)/Makefile
diff --git a/lldb/source/Host/macosx/HostInfoMacOSX.mm b/lldb/source/Host/macosx/HostInfoMacOSX.mm
index 784855d65cd..e7057208e4e 100644
--- a/lldb/source/Host/macosx/HostInfoMacOSX.mm
+++ b/lldb/source/Host/macosx/HostInfoMacOSX.mm
@@ -176,6 +176,7 @@ HostInfoMacOSX::ComputeHeaderDirectory(FileSpec &file_spec)
 bool
 HostInfoMacOSX::ComputePythonDirectory(FileSpec &file_spec)
 {
+#ifndef LLDB_DISABLE_PYTHON
     FileSpec lldb_file_spec;
     if (!GetLLDBPath(lldb::ePathTypeLLDBShlibDir, lldb_file_spec))
         return false;
@@ -200,7 +201,9 @@ HostInfoMacOSX::ComputePythonDirectory(FileSpec &file_spec)
         ::strncat(raw_path, python_version_dir.c_str(), sizeof(raw_path) - strlen(raw_path) - 1);
     }
     file_spec.GetDirectory().SetCString(raw_path);
-    return true;
+#else
+    return false;
+#endif
 }
 
 bool
diff --git a/lldb/source/Host/posix/HostInfoPosix.cpp b/lldb/source/Host/posix/HostInfoPosix.cpp
index 77fdc2b61a3..dbbfa47f156 100644
--- a/lldb/source/Host/posix/HostInfoPosix.cpp
+++ b/lldb/source/Host/posix/HostInfoPosix.cpp
@@ -173,6 +173,7 @@ HostInfoPosix::ComputeHeaderDirectory(FileSpec &file_spec)
 bool
 HostInfoPosix::ComputePythonDirectory(FileSpec &file_spec)
 {
+#ifndef LLDB_DISABLE_PYTHON
     FileSpec lldb_file_spec;
     if (!GetLLDBPath(lldb::ePathTypeLLDBShlibDir, lldb_file_spec))
         return false;
@@ -190,4 +191,7 @@ HostInfoPosix::ComputePythonDirectory(FileSpec &file_spec)
 
     file_spec.GetDirectory().SetCString(raw_path);
     return true;
+#else
+    return false;
+#endif
 }
diff --git a/lldb/source/Interpreter/Makefile b/lldb/source/Interpreter/Makefile
index d6a51e6ba72..de5cbe24c39 100644
--- a/lldb/source/Interpreter/Makefile
+++ b/lldb/source/Interpreter/Makefile
@@ -13,12 +13,16 @@ BUILD_ARCHIVE = 1
 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 @@ install-local:: lldb.py
 
 clean-local::
 	$(Verb) $(RM) -f LLDBWrapPython.cpp lldb.py
+endif
diff --git a/lldb/source/Plugins/Process/FreeBSD/Makefile b/lldb/source/Plugins/Process/FreeBSD/Makefile
index 8d16a4a2b4c..7f546540e55 100644
--- a/lldb/source/Plugins/Process/FreeBSD/Makefile
+++ b/lldb/source/Plugins/Process/FreeBSD/Makefile
@@ -12,6 +12,6 @@ LIBRARYNAME := lldbPluginProcessFreeBSD
 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
diff --git a/lldb/source/Plugins/Process/Linux/Makefile b/lldb/source/Plugins/Process/Linux/Makefile
index 850a0290b62..239e94d608e 100644
--- a/lldb/source/Plugins/Process/Linux/Makefile
+++ b/lldb/source/Plugins/Process/Linux/Makefile
@@ -12,6 +12,6 @@ LIBRARYNAME := lldbPluginProcessLinux
 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
diff --git a/lldb/source/Plugins/Process/POSIX/Makefile b/lldb/source/Plugins/Process/POSIX/Makefile
index 96b60cde021..e8ac3a8ae0e 100644
--- a/lldb/source/Plugins/Process/POSIX/Makefile
+++ b/lldb/source/Plugins/Process/POSIX/Makefile
@@ -14,19 +14,19 @@ BUILD_ARCHIVE = 1
 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