[Lldb-commits] [lldb] r124929 - in /lldb/trunk: Makefile lib/Makefile

[Greg Clayton]

Author: gclayton
Date: Fri Feb  4 20:32:19 2011
New Revision: 124929

URL: http://llvm.org/viewvc/llvm-project?rev=124929&view=rev
Log:
Python override patch from Jai Menon.


Modified:
    lldb/trunk/Makefile
    lldb/trunk/lib/Makefile

Modified: lldb/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/Makefile?rev=124929&r1=124928&r2=124929&view=diff
==============================================================================
--- lldb/trunk/Makefile (original)
+++ lldb/trunk/Makefile Fri Feb  4 20:32:19 2011
@@ -28,12 +28,15 @@
 # Include LLVM common makefile.
 include $(LEVEL)/Makefile.common
 
+# Set Python include directory
+PYTHON_INC_DIR = /usr/include/python2.6
+
 # Set common LLDB build flags.
 CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/include 
 CPP.Flags += -I$(PROJ_OBJ_DIR)/$(LLDB_LEVEL)/include
 CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/../clang/include
 CPP.Flags += -I$(PROJ_OBJ_DIR)/$(LLDB_LEVEL)/../clang/include
-CPP.Flags += -I/usr/include/python2.6
+CPP.Flags += -I$(PYTHON_INC_DIR)
 CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source
 CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Utility
 CPP.Flags += -I$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/source/Plugins/Process/Utility

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=124929&r1=124928&r2=124929&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Fri Feb  4 20:32:19 2011
@@ -17,6 +17,8 @@
 LINK_LIBS_IN_SHARED = 1
 SHARED_LIBRARY = 1
 
+PYTHON_BUILD_FLAGS = -lpython2.6
+
 # Include all archives in liblldb.a files
 USEDLIBS = lldbAPI.a \
 	lldbBreakpoint.a \
@@ -84,7 +86,7 @@
     LLVMLibsOptions += -avoid-version
 	LLVMLibsOptions += -F/System/Library/Frameworks -F/System/Library/PrivateFrameworks
 	LLVMLibsOptions += -framework Foundation -framework CoreFoundation 
-	LLVMLibsOptions += -framework DebugSymbols -lpython2.6 -lobjc
+	LLVMLibsOptions += -framework DebugSymbols $(PYTHON_BUILD_FLAGS) -lobjc
 	LLVMLibsOptions += -Wl,-exported_symbols_list -Wl,"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/resources/lldb-framework-exports" 
     # Mac OS X 10.4 and earlier tools do not allow a second -install_name on command line
     DARWIN_VERS := $(shell echo $(TARGET_TRIPLE) | sed 's/.*darwin\([0-9]*\).*/\1/')
@@ -101,5 +103,5 @@
     # Don't allow unresolved symbols.
     LLVMLibsOptions += -Wl,--no-undefined
     # Link in python
-    LD.Flags += -lpython2.6
+    LD.Flags += $(PYTHON_BUILD_FLAGS)
 endif