diff options
| author | Sylvestre Ledru <sylvestre@debian.org> | 2013-12-06 23:16:23 +0000 |
|---|---|---|
| committer | Sylvestre Ledru <sylvestre@debian.org> | 2013-12-06 23:16:23 +0000 |
| commit | c061cceed2a76e1d3a9a3ea8ad184f637ea797cf (patch) | |
| tree | b7056be480ac666b86854ac2a6540ea33fe03944 | |
| parent | 27fddbaf2145eb109b1c5f3d81106454e6a45bbf (diff) | |
| download | bcm5719-llvm-c061cceed2a76e1d3a9a3ea8ad184f637ea797cf.tar.gz bcm5719-llvm-c061cceed2a76e1d3a9a3ea8ad184f637ea797cf.zip | |
Fixed Makefile-based install to place python packages in the LLDB install tree.
Failure to install python packages now fails the make install.
This patch properly handles the optional DESTDIR variable.
Patch by Todd Fiala
llvm-svn: 196624
| -rwxr-xr-x | lldb/scripts/finish-swig-wrapper-classes.sh | 5 | ||||
| -rw-r--r-- | lldb/source/Interpreter/Makefile | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lldb/scripts/finish-swig-wrapper-classes.sh b/lldb/scripts/finish-swig-wrapper-classes.sh index f0bca4bf18e..806f2862af6 100755 --- a/lldb/scripts/finish-swig-wrapper-classes.sh +++ b/lldb/scripts/finish-swig-wrapper-classes.sh @@ -89,6 +89,11 @@ do ./finish-swig-${curlang}-LLDB.sh $SRC_ROOT $TARGET_DIR $CONFIG_BUILD_DIR "${PREFIX}" "${debug_flag}" "${makefile_flag}" + retval=$? + if [ $retval -ne 0 ]; then + echo "$(pwd)/finish-swig-${curlang}-LLDB.sh failed with exit code $retval" + exit $retval + fi fi fi done diff --git a/lldb/source/Interpreter/Makefile b/lldb/source/Interpreter/Makefile index 5a6ffba5d2a..a788b5ba511 100644 --- a/lldb/source/Interpreter/Makefile +++ b/lldb/source/Interpreter/Makefile @@ -35,7 +35,7 @@ LLDBWrapPython.cpp lldb.py: $(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/Python/modify- install-local:: lldb.py $(Echo) Installing $(BuildMode) LLDB python modules - $(Verb) "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/finish-swig-wrapper-classes.sh" "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)" "$(PROJ_OBJ_DIR)" "$(PROJ_OBJ_DIR)" "" -m + $(Verb) "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/finish-swig-wrapper-classes.sh" "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)" "$(PROJ_OBJ_DIR)" "$(PROJ_OBJ_DIR)" "$(DESTDIR)$(prefix)" -m clean-local:: $(Verb) $(RM) -f LLDBWrapPython.cpp lldb.py |
