maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Patch from Jean-Daniel Dupas: 

Makefile patch to explicitly use PROJ_SRC_DIR when required. It fixes 
        build when obj dir is not source dir. 

I also fixed a build warning in ClangResultSynthesizer.cpp.

llvm-svn: 108210
This commit is contained in:
Greg Clayton 2010-07-12 23:14:00 +00:00
parent 5467c9fac5
commit c8e11e17aa
5 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/lib/Makefile
View File

@ -87,7 +87,7 @@ ifeq ($(HOST_OS),Darwin)
LLVMLibsOptions += -F/System/Library/Frameworks -F/System/Library/PrivateFrameworks
LLVMLibsOptions += -framework Foundation -framework CoreFoundation
LLVMLibsOptions += -framework DebugSymbols -lpython2.6 -lobjc
LLVMLibsOptions += -Wl,-exported_symbols_list -Wl,$(LLDB_LEVEL)/resources/lldb-framework-exports
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/')
ifneq ($(DARWIN_VERS),8)

9
lldb/source/Expression/ClangResultSynthesizer.cpp
View File

@ -27,10 +27,11 @@ using namespace clang;
using namespace lldb_private;
ClangResultSynthesizer::ClangResultSynthesizer(ASTConsumer *passthrough) :
m_passthrough(passthrough),
m_passthrough_sema(NULL),
m_sema(NULL),
m_ast_context(NULL)
m_ast_context (NULL),
m_passthrough (passthrough),
m_passthrough_sema (NULL),
m_sema (NULL),
m_action (NULL)
{
if (!m_passthrough)
return;

4
lldb/source/Interpreter/Makefile
View File

@ -20,5 +20,5 @@ LLDB_BIN_DIR := $(PROJ_OBJ_ROOT)/$(BuildMode)/bin
PYTHON_DIR := $(LLDB_BIN_DIR)
LLDBWrapPython.cpp:
swig -c++ -shadow -python -I"$(LLDB_LEVEL)/include" -I./. -outdir "$(LLDB_BIN_DIR)" -o LLDBWrapPython.cpp "$(LLDB_LEVEL)/scripts/lldb.swig"
cp embedded_interpreter.py "$(PYTHON_DIR)"
swig -c++ -shadow -python -I"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/include" -I./. -outdir "$(LLDB_BIN_DIR)" -o LLDBWrapPython.cpp "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/lldb.swig"
cp "$(PROJ_SRC_DIR)/embedded_interpreter.py" "$(PYTHON_DIR)"

4
lldb/source/Makefile
View File

@ -16,5 +16,5 @@ BUILT_SOURCES = LLDB_vers.c
include $(LLDB_LEVEL)/Makefile
LLDB_vers.c: $(LLDB_LEVEL)/scripts/generate-vers.pl $(LLDB_LEVEL)/lldb.xcodeproj/project.pbxproj
$(LLDB_LEVEL)/scripts/generate-vers.pl $(LLDB_LEVEL)/lldb.xcodeproj/project.pbxproj > LLDB_vers.c
LLDB_vers.c: $(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/generate-vers.pl $(PROJ_SRC_DIR)/$(LLDB_LEVEL)/lldb.xcodeproj/project.pbxproj
"$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/generate-vers.pl" "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/lldb.xcodeproj/project.pbxproj" > LLDB_vers.c

2
lldb/tools/driver/Makefile
View File

@ -19,7 +19,7 @@ include $(LLDB_LEVEL)/../../Makefile.config
ifeq ($(HOST_OS),Darwin)
LD.Flags += -Wl,-rpath,@loader_path/../lib/
LD.Flags += -Wl,-sectcreate -Wl,__TEXT -Wl,__info_plist -Wl,lldb-Info.plist
LD.Flags += -Wl,-sectcreate -Wl,__TEXT -Wl,__info_plist -Wl,"$(PROJ_SRC_DIR)/lldb-Info.plist"
endif
ifeq ($(HOST_OS),Linux)