[Lldb-commits] [lldb] r108210 - in /lldb/trunk: lib/Makefile source/Expression/ClangResultSynthesizer.cpp source/Interpreter/Makefile source/Makefile tools/driver/Makefile

[Greg Clayton]

Author: gclayton
Date: Mon Jul 12 18:14:00 2010
New Revision: 108210

URL: http://llvm.org/viewvc/llvm-project?rev=108210&view=rev
Log:
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.


Modified:
    lldb/trunk/lib/Makefile
    lldb/trunk/source/Expression/ClangResultSynthesizer.cpp
    lldb/trunk/source/Interpreter/Makefile
    lldb/trunk/source/Makefile
    lldb/trunk/tools/driver/Makefile

Modified: lldb/trunk/lib/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lib/Makefile?rev=108210&r1=108209&r2=108210&view=diff
==============================================================================
--- lldb/trunk/lib/Makefile (original)
+++ lldb/trunk/lib/Makefile Mon Jul 12 18:14:00 2010
@@ -87,7 +87,7 @@
 	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)

Modified: lldb/trunk/source/Expression/ClangResultSynthesizer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangResultSynthesizer.cpp?rev=108210&r1=108209&r2=108210&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangResultSynthesizer.cpp (original)
+++ lldb/trunk/source/Expression/ClangResultSynthesizer.cpp Mon Jul 12 18:14:00 2010
@@ -27,10 +27,11 @@
 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;

Modified: lldb/trunk/source/Interpreter/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/Makefile?rev=108210&r1=108209&r2=108210&view=diff
==============================================================================
--- lldb/trunk/source/Interpreter/Makefile (original)
+++ lldb/trunk/source/Interpreter/Makefile Mon Jul 12 18:14:00 2010
@@ -20,5 +20,5 @@
 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)"

Modified: lldb/trunk/source/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Makefile?rev=108210&r1=108209&r2=108210&view=diff
==============================================================================
--- lldb/trunk/source/Makefile (original)
+++ lldb/trunk/source/Makefile Mon Jul 12 18:14:00 2010
@@ -16,5 +16,5 @@
 
 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

Modified: lldb/trunk/tools/driver/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/driver/Makefile?rev=108210&r1=108209&r2=108210&view=diff
==============================================================================
--- lldb/trunk/tools/driver/Makefile (original)
+++ lldb/trunk/tools/driver/Makefile Mon Jul 12 18:14:00 2010
@@ -19,7 +19,7 @@
 
 ifeq ($(HOST_OS),Darwin)
 	LD.Flags += -Wl,-rpath, at 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)