diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 08:10:10 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 08:10:10 +0000 |
| commit | 33fdafe1bf23cd59c318c40b936090b64e254cf0 (patch) | |
| tree | 48ec7fdf8e096a795a99bf471d5450403693ca80 /solenv/bin/addsym-macosx.sh | |
| parent | d78e3e40e4655e2c52fcb1a510709fd552adf5ee (diff) | |
INTEGRATION: CWS macosxpbuildrepair (1.2.70); FILE MERGED
2007/04/18 14:36:14 tra 1.2.70.4: #74325#fixing typo
2007/04/17 19:51:29 tra 1.2.70.3: #74325#reverting previous changes, they are not more reliable then the alternatively proposed patch but include more changes
2007/04/16 08:48:01 ericb 1.2.70.2: #i74325# previous change didn't work. New try to correctly filter symbols before linking
2007/03/31 13:50:49 tra 1.2.70.1: #74325# using symbolic output of nm to extract rtti symbols
Diffstat (limited to 'solenv/bin/addsym-macosx.sh')
| -rwxr-xr-x | solenv/bin/addsym-macosx.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/solenv/bin/addsym-macosx.sh b/solenv/bin/addsym-macosx.sh index 8c75c4c55707..b69f59fff319 100755 --- a/solenv/bin/addsym-macosx.sh +++ b/solenv/bin/addsym-macosx.sh @@ -22,5 +22,8 @@ s#^#^# s#$#$#' | tr '\n' '|' | sed "s#|\$##" >$2 # Please note that the awk expression expects to get the output of 'nm -gx'! +# On Panther we have to filter out symbols with a value "1f" otherwise external +# symbols will erroneously be added to the generated export symbols list file. awk -v SYMBOLSREGEXP="`cat $2`" ' -match ($6,SYMBOLSREGEXP) > 0 && $6 !~ /_GLOBAL_/ { if ($2 != 1) print $6 }' +match ($6,SYMBOLSREGEXP) > 0 && $6 !~ /_GLOBAL_/ { if (($2 != 1) && ( $2 != "1f" ) ) print $6 }' + |