[Lldb-commits] [PATCH] linux: fix include in lldb.swig

[Stephen Wilson]

Hi Johnny,

The following patch should apply cleanly atop r121924 if it is acceptable.

Thanks again!



    Extend Swig's include search path.
    
    Cover both /usr/include and /usr/local/include.  This should allow Swig to find
    system headers such as stdint.h on all platforms we currently support.

diff --git a/source/Interpreter/Makefile b/source/Interpreter/Makefile
index 248de5e..6e72f49 100644
--- a/source/Interpreter/Makefile
+++ b/source/Interpreter/Makefile
@@ -18,9 +18,16 @@ include $(LLDB_LEVEL)/Makefile
 LLDB_PYTHON_SWIG_CPP = $(PROJ_OBJ_ROOT)/$(BuildMode)/LLDBWrapPython.cpp
 LLDB_BIN_DIR := $(PROJ_OBJ_ROOT)/$(BuildMode)/bin
 PYTHON_DIR := $(LLDB_BIN_DIR)
+LLDB_SWIG_INCLUDE_DIRS:= -I"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/include" -I./.
+
+# We need Swig to process stdint.h, but by default it will not inspect system
+# include directories.  The following should cover the standard locations on
+# most platforms.
+LLDB_SWIG_INCLUDE_DIRS += -I"/usr/local/include"
+LLDB_SWIG_INCLUDE_DIRS += -I"/usr/include"
 
 LLDBWrapPython.cpp:
-	swig -c++ -shadow -python -I"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/include"            \
-          -I./. -I"/usr/local/include" -D__STDC_LIMIT_MACROS -outdir "$(LLDB_BIN_DIR)" \
-          -o LLDBWrapPython.cpp "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/lldb.swig"
+	swig -c++ -shadow -python $(LLDB_SWIG_INCLUDE_DIRS)   \
+           -D__STDC_LIMIT_MACROS -outdir "$(LLDB_BIN_DIR)"    \
+           -o LLDBWrapPython.cpp "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/lldb.swig"
 	cp "$(PROJ_SRC_DIR)/embedded_interpreter.py" "$(PYTHON_DIR)"