69578399e2
...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
162 lines
2.6 KiB
Diff
162 lines
2.6 KiB
Diff
--- Cbc/ltmain.sh
|
|
+++ Cbc/ltmain.sh
|
|
@@ -1254,6 +1254,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
|
|
@@ -1607,6 +1613,11 @@
|
|
continue
|
|
;;
|
|
|
|
+ -mllvm)
|
|
+ prev=mllvm
|
|
+ continue
|
|
+ ;;
|
|
+
|
|
-module)
|
|
module=yes
|
|
continue
|
|
--- Cgl/ltmain.sh
|
|
+++ Cgl/ltmain.sh
|
|
@@ -1254,6 +1254,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
|
|
@@ -1607,6 +1613,11 @@
|
|
continue
|
|
;;
|
|
|
|
+ -mllvm)
|
|
+ prev=mllvm
|
|
+ continue
|
|
+ ;;
|
|
+
|
|
-module)
|
|
module=yes
|
|
continue
|
|
--- Clp/ltmain.sh
|
|
+++ Clp/ltmain.sh
|
|
@@ -1254,6 +1254,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
|
|
@@ -1607,6 +1613,11 @@
|
|
continue
|
|
;;
|
|
|
|
+ -mllvm)
|
|
+ prev=mllvm
|
|
+ continue
|
|
+ ;;
|
|
+
|
|
-module)
|
|
module=yes
|
|
continue
|
|
--- CoinMP/ltmain.sh
|
|
+++ CoinMP/ltmain.sh
|
|
@@ -1254,6 +1254,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
|
|
@@ -1607,6 +1613,11 @@
|
|
continue
|
|
;;
|
|
|
|
+ -mllvm)
|
|
+ prev=mllvm
|
|
+ continue
|
|
+ ;;
|
|
+
|
|
-module)
|
|
module=yes
|
|
continue
|
|
--- CoinUtils/ltmain.sh
|
|
+++ CoinUtils/ltmain.sh
|
|
@@ -1254,6 +1254,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
|
|
@@ -1607,6 +1613,11 @@
|
|
continue
|
|
;;
|
|
|
|
+ -mllvm)
|
|
+ prev=mllvm
|
|
+ continue
|
|
+ ;;
|
|
+
|
|
-module)
|
|
module=yes
|
|
continue
|
|
--- Osi/ltmain.sh
|
|
+++ Osi/ltmain.sh
|
|
@@ -1254,6 +1254,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
|
|
@@ -1607,6 +1613,11 @@
|
|
continue
|
|
;;
|
|
|
|
+ -mllvm)
|
|
+ prev=mllvm
|
|
+ continue
|
|
+ ;;
|
|
+
|
|
-module)
|
|
module=yes
|
|
continue
|