* m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Gah. Merge error

corrected.
This commit is contained in:
Gary V. Vaughan 2004-09-23 13:46:46 +00:00
parent e9b2b3f264
commit c82db6b1e0
2 changed files with 6 additions and 7 deletions

View File

@ -1,4 +1,9 @@
04-09-23 Gary V. Vaughan <gary@gnu.org> 2004-09-23 Gary V. Vaughan <gary@gnu.org>
* m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): Gah. Merge error
corrected.
2004-09-23 Gary V. Vaughan <gary@gnu.org>
Since defs can change (path to grep for example) when it is made Since defs can change (path to grep for example) when it is made
for a different host, it can't be shipped. That also means that for a different host, it can't be shipped. That also means that

6
m4/libtool.m4 vendored
View File

@ -2726,12 +2726,6 @@ case `$NM -V 2>&1` in
symcode='[[ABCDGIRSTW]]' ;; symcode='[[ABCDGIRSTW]]' ;;
esac esac
# If we're using GNU nm, then use its standard symbol codes.
case `$NM -V 2>&1` in
*GNU* | *'with BFD'*)
symcode='[[ABCDGIRSTW]]' ;;
esac
# Transform an extracted symbol line into a proper C declaration. # Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symols differently, # Some systems (esp. on ia64) link data and code symols differently,
# so use this general approach. # so use this general approach.