caam

changeset 17:9e9c063c92cf

find changesets by author, revision, files, or words in the commit message
`-R -> -Wl,-rpath=' for clang
author HIROSE Yuuji <yuuji@gentei.org>
date Wed, 11 Mar 2015 08:56:45 +0900
parents 9dcdb591a0dc
children 9002e9289581
files bin/caam
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line diff
     1.1 --- a/bin/caam	Wed Mar 11 08:24:14 2015 +0900
     1.2 +++ b/bin/caam	Wed Mar 11 08:56:45 2015 +0900
     1.3 @@ -7,7 +7,7 @@
     1.4  
     1.5  ca=`echo $CAAM_ADD|tr : ' '`
     1.6  cpx=`echo $CAAM_PREFIXES|tr : ' '`
     1.7 -CAAM_GCC=${GCC:-`which gcc`}
     1.8 +CAAM_GCC=${GCC:-`which cc`}
     1.9  CAAM_CXX=${CXX:-`which c++`}
    1.10  if [ -x /usr/xpg4/bin/sh ]; then
    1.11    CAAM_SH=/usr/xpg4/bin/sh
    1.12 @@ -108,7 +108,7 @@
    1.13    [ $debug ] && echo checking $pfx
    1.14    [ -d $pfx ] || continue
    1.15    cf="$cf -I${pfx}${e:+/}include"
    1.16 -  lf="$lf -L${pfx}${e:+/}lib -R${pfx}${e:+/}lib"
    1.17 +  lf="$lf -L${pfx}${e:+/}lib -Wl,-rpath=${pfx}${e:+/}lib"
    1.18    lp="$lp${lp:+:}${pfx}${e:+/}lib"
    1.19    [ -d $pfx/lib/pkgconfig ] && pcp=$pcp${pcp:+:}$pfx${e:+/}lib/pkgconfig
    1.20  done
    1.21 @@ -146,7 +146,7 @@
    1.22      oifs=$IFS
    1.23      IFS=:
    1.24      for d in $LD_RUN_PATH; do
    1.25 -      ldf=$ldf${ldf:+\ }"-R $d -L $d"
    1.26 +      ldf=$ldf${ldf:+\ }"-Wl,-rpath=$d -L$d"
    1.27      done
    1.28      IFS=$oifs
    1.29    fi