diff options
| author | Greg Clayton <gclayton@apple.com> | 2014-03-14 18:24:30 +0000 |
|---|---|---|
| committer | Greg Clayton <gclayton@apple.com> | 2014-03-14 18:24:30 +0000 |
| commit | 9bb8cb19651aca8ece50e72402ae6c39a1264504 (patch) | |
| tree | e9f24e651446027b3735839a1a00e8c91c7e0b85 | |
| parent | eb4592b18d00ceb60b106a77bb74b4bb0ee7b5c9 (diff) | |
| download | bcm5719-llvm-9bb8cb19651aca8ece50e72402ae6c39a1264504.tar.gz bcm5719-llvm-9bb8cb19651aca8ece50e72402ae6c39a1264504.zip | |
Move LLDBWrapPython.cpp into the build folder for Xcode builds so it doesn't muck with cmake builds.
llvm-svn: 203956
| -rw-r--r-- | lldb/.gitignore | 1 | ||||
| -rw-r--r-- | lldb/lldb.xcodeproj/project.pbxproj | 4 | ||||
| -rwxr-xr-x | lldb/scripts/Python/build-swig-Python.sh | 7 |
3 files changed, 3 insertions, 9 deletions
diff --git a/lldb/.gitignore b/lldb/.gitignore index c393e946ada..520f7acbe29 100644 --- a/lldb/.gitignore +++ b/lldb/.gitignore @@ -3,4 +3,3 @@ build/ llvm-build/ *xcuserdata test/20* -source/LLDBWrapPython.cpp diff --git a/lldb/lldb.xcodeproj/project.pbxproj b/lldb/lldb.xcodeproj/project.pbxproj index b2a4aac5c6e..2a4479715ce 100644 --- a/lldb/lldb.xcodeproj/project.pbxproj +++ b/lldb/lldb.xcodeproj/project.pbxproj @@ -1207,7 +1207,7 @@ 26A0DA4D140F721D006DA411 /* HashedNameToDIE.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = HashedNameToDIE.h; sourceTree = "<group>"; }; 26A3B4AC1181454800381BC2 /* ObjectContainerBSDArchive.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ObjectContainerBSDArchive.cpp; sourceTree = "<group>"; }; 26A3B4AD1181454800381BC2 /* ObjectContainerBSDArchive.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ObjectContainerBSDArchive.h; sourceTree = "<group>"; }; - 26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = LLDBWrapPython.cpp; path = source/LLDBWrapPython.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; + 26A4EEB511682AAC007A372A /* LLDBWrapPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = LLDBWrapPython.cpp; sourceTree = BUILT_PRODUCTS_DIR; xcLanguageSpecificationIdentifier = xcode.lang.cpp; }; 26A527BD14E24F5F00F3A14A /* ProcessMachCore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ProcessMachCore.cpp; sourceTree = "<group>"; }; 26A527BE14E24F5F00F3A14A /* ProcessMachCore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProcessMachCore.h; sourceTree = "<group>"; }; 26A527BF14E24F5F00F3A14A /* ThreadMachCore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadMachCore.cpp; sourceTree = "<group>"; }; @@ -4313,7 +4313,7 @@ inputPaths = ( "$(BUILT_PRODUCTS_DIR)/lldb.py", "$(SRCROOT)/source/Interpreter/embedded_interpreter.py", - "$(SRCROOT)/scripts/Python/LLDBWrapPython.o", + "$(OBJECT_FILE_DIR_normal)/$(CURRENT_ARCH)/LLDBWrapPython.o", ); name = "Finish swig wrapper classes (lldb)"; outputPaths = ( diff --git a/lldb/scripts/Python/build-swig-Python.sh b/lldb/scripts/Python/build-swig-Python.sh index 34a1ff27ff3..402d0852006 100755 --- a/lldb/scripts/Python/build-swig-Python.sh +++ b/lldb/scripts/Python/build-swig-Python.sh @@ -36,12 +36,7 @@ else GenerateDependencies=0 fi -if [ $MakefileCalled -eq 0 ] -then - swig_output_file=${SRC_ROOT}/source/LLDBWrapPython.cpp -else - swig_output_file=${TARGET_DIR}/LLDBWrapPython.cpp -fi +swig_output_file=${TARGET_DIR}/LLDBWrapPython.cpp swig_input_file=${SRC_ROOT}/scripts/lldb.swig swig_python_extensions=${SRC_ROOT}/scripts/Python/python-extensions.swig swig_python_wrapper=${SRC_ROOT}/scripts/Python/python-wrapper.swig |
