~ubuntu-branches/ubuntu/trusty/llvm-toolchain-snapshot/trusty-201310232150

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
Index: llvm-toolchain-snapshot_3.3~svn181457/configure
===================================================================
--- llvm-toolchain-snapshot_3.3~svn181457.orig/configure	2013-05-07 22:31:28.000000000 +0200
+++ llvm-toolchain-snapshot_3.3~svn181457/configure	2013-05-08 20:26:01.000000000 +0200
@@ -13699,7 +13699,7 @@
       case $llvm_cv_os_type in
         Linux)
           if test -n "$llvm_cv_oppath" ; then
-            LIBS="$LIBS -lopagent -L${llvm_cv_oppath} -Wl,-rpath,${llvm_cv_oppath}"
+            #LIBS="$LIBS -lopagent -L${llvm_cv_oppath} -Wl,-rpath,${llvm_cv_oppath}"
                                                             { echo "$as_me:$LINENO: checking for library containing bfd_init" >&5
 echo $ECHO_N "checking for library containing bfd_init... $ECHO_C" >&6; }
 if test "${ac_cv_search_bfd_init+set}" = set; then
@@ -13795,7 +13795,7 @@
 echo "${ECHO_T}$ac_cv_search_bfd_init" >&6; }
 ac_res=$ac_cv_search_bfd_init
 if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+  test "$ac_res" = "none required" || true
 
 fi
 
@@ -13831,8 +13831,8 @@
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+    ac_res="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed"
+    LIBS="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed $ac_func_search_save_LIBS"
   fi
   rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"