Python override patch from Jai Menon.

llvm-svn: 124929
This commit is contained in:
Greg Clayton 2011-02-05 02:32:19 +00:00
parent 9c139319f8
commit 8a9ef34039
2 changed files with 8 additions and 3 deletions

View File

@ -28,12 +28,15 @@ LEVEL := $(LLDB_LEVEL)/../..
# 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

View File

@ -17,6 +17,8 @@ NO_BUILD_ARCHIVE = 1
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 @@ ifeq ($(HOST_OS),Darwin)
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 @@ ifeq ($(HOST_OS), Linux)
# Don't allow unresolved symbols.
LLVMLibsOptions += -Wl,--no-undefined
# Link in python
LD.Flags += -lpython2.6
LD.Flags += $(PYTHON_BUILD_FLAGS)
endif