Browse code

Revert r11202: do not create copy relocations when linking to shared libs

This caused more problems than it solved and is no longer required.

Originally committed as revision 11210 to svn://svn.ffmpeg.org/ffmpeg/trunk

Måns Rullgård authored on 2007/12/13 06:51:52
Showing 1 changed files
... ...
@@ -1737,7 +1737,6 @@ enabled extra_warnings && check_cflags -Winline
1737 1737
 check_ldflags -Wl,--warn-common
1738 1738
 check_ldflags $LDLATEFLAGS
1739 1739
 check_ldflags -Wl,-Bsymbolic
1740
-check_ldflags -Wl,-z,nocopyreloc
1741 1740
 
1742 1741
 if enabled small; then
1743 1742
     check_cflags -Os            # not all compilers support -Os
... ...
@@ -1753,9 +1752,12 @@ fi
1753 1753
 
1754 1754
 # PIC flags for shared library objects where they are needed
1755 1755
 if enabled shared; then
1756
-    case "$arch" in
1757
-        x86_64|ia64|alpha|sparc*|power*) add_cflags '\$(PIC)' ;;
1758
-    esac
1756
+    # LIBOBJFLAGS may have already been set in the OS configuration
1757
+    if test -z "$LIBOBJFLAGS" ; then
1758
+        case "$arch" in
1759
+            x86_64|ia64|alpha|sparc*|power*) LIBOBJFLAGS='$(PIC)' ;;
1760
+        esac
1761
+    fi
1759 1762
 fi
1760 1763
 
1761 1764
 if enabled gprof; then