summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre@debian.org>2013-12-05 12:51:47 +0000
committerSylvestre Ledru <sylvestre@debian.org>2013-12-05 12:51:47 +0000
commit13b0fba48bc8cbfc1edb1d8a0b235b34dc49b4a3 (patch)
treec11739bacd968dec6d8341f5c3954ea169ae64cb
parenta6beac1accd9222e4567bca8c3000e87303d6204 (diff)
downloadbcm5719-llvm-13b0fba48bc8cbfc1edb1d8a0b235b34dc49b4a3.tar.gz
bcm5719-llvm-13b0fba48bc8cbfc1edb1d8a0b235b34dc49b4a3.zip
Revert: "Patch from Todd Fiala that install the lldb.py module in the prefix directory and also makes install fail if the prefix directory can't be accessed"
Does not respect the prefix llvm-svn: 196499
-rwxr-xr-xlldb/scripts/finish-swig-wrapper-classes.sh5
-rw-r--r--lldb/source/Interpreter/Makefile2
2 files changed, 1 insertions, 6 deletions
diff --git a/lldb/scripts/finish-swig-wrapper-classes.sh b/lldb/scripts/finish-swig-wrapper-classes.sh
index 806f2862af6..f0bca4bf18e 100755
--- a/lldb/scripts/finish-swig-wrapper-classes.sh
+++ b/lldb/scripts/finish-swig-wrapper-classes.sh
@@ -89,11 +89,6 @@ 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 f0772927f54..5a6ffba5d2a 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)" "$(prefix)" -m
+ $(Verb) "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)/scripts/finish-swig-wrapper-classes.sh" "$(PROJ_SRC_DIR)/$(LLDB_LEVEL)" "$(PROJ_OBJ_DIR)" "$(PROJ_OBJ_DIR)" "" -m
clean-local::
$(Verb) $(RM) -f LLDBWrapPython.cpp lldb.py
OpenPOWER on IntegriCloud