summaryrefslogtreecommitdiff
path: root/external/redland/rasqal
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-05-02 22:48:11 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-05-02 22:51:33 +0200
commit69578399e2a7192f55834e133b5d4f119b9cc5ad (patch)
treebf373c64acc2473ff3463a3744561e1a07cf6f87 /external/redland/rasqal
parent9999d9ee61f0adda79ef0886fdf487b5ec01e8e7 (diff)
Make some externals' libtool copies cope with -mllvm
...as needed e.g. for <https://bugs.llvm.org/show_bug.cgi?id=32349> "r294897 + NewGVN cause build failure with LibreOffice", by applying <http://git.savannah.gnu.org/cgit/libtool.git/commit/ ?id=d9a35fe9d3508b5c0d56e7f2ec80fc05e8415fa3> "libtool: Discard '-mllvm $arg' options when linking." Change-Id: Id2afc3c8af3c6c9595e7cb33cef5084a74f78cb0
Diffstat (limited to 'external/redland/rasqal')
-rw-r--r--external/redland/rasqal/libtool.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/external/redland/rasqal/libtool.patch b/external/redland/rasqal/libtool.patch
new file mode 100644
index 000000000000..b0baae661bab
--- /dev/null
+++ b/external/redland/rasqal/libtool.patch
@@ -0,0 +1,27 @@
+--- build/ltmain.sh
++++ build/ltmain.sh
+@@ -5301,6 +5301,12 @@
+ prev=
+ continue
+ ;;
++ mllvm)
++ # Clang does not use LLVM to link, so we can simply discard any
++ # '-mllvm $arg' options when doing the link step.
++ prev=
++ continue
++ ;;
+ objectlist)
+ if test -f "$arg"; then
+ save_arg=$arg
+@@ -5639,6 +5645,11 @@
+ continue
+ ;;
+
++ -mllvm)
++ prev=mllvm
++ continue
++ ;;
++
+ -module)
+ module=yes
+ continue