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

5 files changed, 11 insertions, 10 deletions

diff --git a/lldb/lib/Makefile b/lldb/lib/Makefile
index 5e37a24e6c1..50df5831d30 100644
--- a/lldb/lib/Makefile
+++ b/lldb/lib/Makefile
@@ -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)
diff --git a/lldb/source/Expression/ClangResultSynthesizer.cpp b/lldb/source/Expression/ClangResultSynthesizer.cpp
index 3a5769b7f3b..6d284e48810 100644
--- a/lldb/source/Expression/ClangResultSynthesizer.cpp
+++ b/lldb/source/Expression/ClangResultSynthesizer.cpp
@@ -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;
diff --git a/lldb/source/Interpreter/Makefile b/lldb/source/Interpreter/Makefile
index f6d7afe39ba..0a9d1729ddd 100644
--- a/lldb/source/Interpreter/Makefile
+++ b/lldb/source/Interpreter/Makefile
@@ -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)"
diff --git a/lldb/source/Makefile b/lldb/source/Makefile
index 347aedbe5c2..e985fc06ccc 100644
--- a/lldb/source/Makefile
+++ b/lldb/source/Makefile
@@ -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
diff --git a/lldb/tools/driver/Makefile b/lldb/tools/driver/Makefile
index 08373026605..e9c9017565b 100644
--- a/lldb/tools/driver/Makefile
+++ b/lldb/tools/driver/Makefile
@@ -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)