Fix configure & make build with python disabled

[loladiro]

Summary

This makes sure that nothing that requires Python is being built when the LLDB_DISABLE_PYTHON flag is being passed in. It also changes a use of CPPFLAGS to CPP.Flags since the former is overridden when external flags are passed in while the later is not. I'm not sure exactly why LLDB_DISABLE_PYTHON is in CXXFLAGS rather than CPPFLAGS, but cleaning that up is for another commit.

[emaste]

This is really "Fix configure & make build without Python" I think. I've built w/o Python just fine via CMake + Ninja.

source/Interpreter/Makefile

17 ↗

(On Diff #12529)

I'd prefer a more descriptive name (even though it's used immediately below).

source/Plugins/Process/POSIX/Makefile

17 ↗

(On Diff #12529)

It looks like there are a few other instances in the tree needing the same change

[loladiro]

Changed other instances of CPPFLAGS to CPP.Flags, renamed the DO_BUILD variable to DO_BUILD_LLDBWrapPython, changed commit message.

[loladiro]

Bump. Does this look ok now?

[tfiala]

Putting Ed on this :-)

[loladiro]

Fixed a recent regression with LLDB_DISABLE_PYTHON in HostInfo.

[loladiro]

I have other people running into this. If I don't hear any objections soon I'll go ahead and commit this.

Closed by commit rL217414 (authored by kfischer).

lldb/trunk/scripts/Makefile

 ##===- scripts/Makefile ------------------------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 #
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ..
 include $(LLDB_LEVEL)/../../Makefile.config
 
+ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
 DIRS := Python
+endif
 
 include $(LLDB_LEVEL)/Makefile

lldb/trunk/source/Host/freebsd/Makefile

 ##===- source/Host/freebsd/Makefile --------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../..
 LIBRARYNAME := lldbHostFreeBSD
 BUILD_ARCHIVE = 1
 
-CPPFLAGS += -I/usr/local/include
+CPP.Flags += -I/usr/local/include
 
 include $(LLDB_LEVEL)/Makefile

lldb/trunk/source/Host/macosx/HostInfoMacOSX.mm

HostInfoMacOSX::ComputeHeaderDirectory(FileSpec &file_spec)
     }
     file_spec.GetDirectory().SetCString(raw_path);
     return true;
 }
 
 bool
 HostInfoMacOSX::ComputePythonDirectory(FileSpec &file_spec)
 {
+#ifndef LLDB_DISABLE_PYTHON
     FileSpec lldb_file_spec;
     if (!GetLLDBPath(lldb::ePathTypeLLDBShlibDir, lldb_file_spec))
         return false;
 
     char raw_path[PATH_MAX];
     lldb_file_spec.GetPath(raw_path, sizeof(raw_path));
 
     char *framework_pos = ::strstr(raw_path, "LLDB.framework");
     if (framework_pos)
     {
         framework_pos += strlen("LLDB.framework");
         ::strncpy(framework_pos, "/Resources/Python", PATH_MAX - (framework_pos - raw_path));
     }
     else
     {
         llvm::SmallString<256> python_version_dir;
         llvm::raw_svector_ostream os(python_version_dir);
         os << "/python" << PY_MAJOR_VERSION << '.' << PY_MINOR_VERSION << "/site-packages";
         os.flush();
 
         // We may get our string truncated. Should we protect this with an assert?
         ::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
 HostInfoMacOSX::ComputeSystemPluginsDirectory(FileSpec &file_spec)
 {
     FileSpec lldb_file_spec;
     if (!GetLLDBPath(lldb::ePathTypeLLDBShlibDir, lldb_file_spec))
         return false;

lldb/trunk/source/Host/posix/HostInfoPosix.cpp

HostInfoPosix::ComputeHeaderDirectory(FileSpec &file_spec)
     FileSpec temp_file("/opt/local/include/lldb", false);
     file_spec.GetDirectory().SetCString(temp_file.GetPath().c_str());
     return true;
 }
 
 bool
 HostInfoPosix::ComputePythonDirectory(FileSpec &file_spec)
 {
+#ifndef LLDB_DISABLE_PYTHON
     FileSpec lldb_file_spec;
     if (!GetLLDBPath(lldb::ePathTypeLLDBShlibDir, lldb_file_spec))
         return false;
 
     char raw_path[PATH_MAX];
     lldb_file_spec.GetPath(raw_path, sizeof(raw_path));
 
     llvm::SmallString<256> python_version_dir;
     llvm::raw_svector_ostream os(python_version_dir);
     os << "/python" << PY_MAJOR_VERSION << '.' << PY_MINOR_VERSION << "/site-packages";
     os.flush();
 
     // We may get our string truncated. Should we protect this with an assert?
     ::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
 }

lldb/trunk/source/Interpreter/Makefile

 ##===- source/Interpreter/Makefile  ------------------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../..
 LIBRARYNAME := lldbInterpreter
 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
 
 # Drop -Wself-assign, -Wmissing-field-initializers, -Wsometimes-uninitialized,
 # -Wcast-qual, and -Wdeprecated-register which we are not clean with due to SWIG
 # generated cpp source.
 EXTRA_OPTIONS += -Wno-missing-field-initializers -Wno-self-assign -Wno-sometimes-uninitialized -Wno-cast-qual -Wno-deprecated-register
 
 PYTHON_DIR := $(PROJ_OBJ_ROOT)/$(BuildMode)
 
 LLDBWrapPython.cpp lldb.py: $(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/Python/modify-python-lldb.py \
                             $(wildcard $(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/Python/interface/*.i)
   $(Echo) Generating LLDBWrapPython.cpp
   $(Verb) "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/build-swig-wrapper-classes.sh" "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)" "$(PROJ_OBJ_DIR)" "$(PROJ_OBJ_DIR)" "$(PYTHON_DIR)" -m $(if $(DISABLE_AUTO_DEPENDENCIES),,-M)
   $(Verb) "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/finish-swig-wrapper-classes.sh" "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)" "$(PROJ_OBJ_DIR)" "$(PROJ_OBJ_DIR)" "$(PYTHON_DIR)" -m
 
 install-local:: lldb.py
   $(Echo) Installing $(BuildMode) LLDB python modules
   $(Verb) "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/finish-swig-wrapper-classes.sh" "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)" "$(PROJ_OBJ_DIR)" "$(PROJ_OBJ_DIR)" "$(DESTDIR)$(prefix)" -m
 
 clean-local::
   $(Verb) $(RM) -f LLDBWrapPython.cpp lldb.py
+endif

lldb/trunk/source/Plugins/Process/FreeBSD/Makefile

 ##===- source/Plugins/Process/FreeBSD/Makefile ---------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
 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

lldb/trunk/source/Plugins/Process/Linux/Makefile

 ##===- source/Plugins/Process/Linux/Makefile ---------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
 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

lldb/trunk/source/Plugins/Process/POSIX/Makefile

 ##===- source/Plugins/Process/POSIX/Makefile ---------------*- Makefile -*-===##
 # 
 #                     The LLVM Compiler Infrastructure
 #
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 # 
 ##===----------------------------------------------------------------------===##
 
 LLDB_LEVEL := ../../../..
 LIBRARYNAME := lldbPluginProcessPOSIX
 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