Changeset 2b6622a6


Ignore:
Timestamp:
Oct 24, 2009, 9:21:54 PM (12 years ago)
Author:
Nelson Elhage <nelhage@mit.edu>
Branches:
master, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9
Children:
a3e61a2
Parents:
f9d257b
git-author:
Nelson Elhage <nelhage@mit.edu> (10/23/09 19:30:11)
git-committer:
Nelson Elhage <nelhage@mit.edu> (10/24/09 21:21:54)
Message:
locker-build: Use -R instead of -Wl,-R on Solaris.

On Athena 9 Solaris, `krb5-config --libs` includes
`-R/usr/athena/lib`. Paths passed with -R end up taking precedence
over those passed with -Wl,-R, and so barnowl ends up using the glib
out of /usr/athena/lib unless we specify the barnowl library dir using
-R as well. Unfortunately, gcc elsewhere does not understand -R, so
conditionalize on the uname.

Signed-off-by: Nelson Elhage <nelhage@mit.edu>
File:
1 edited

Legend:

Unmodified
Added
Removed
  • scripts/locker-build

    r130633c r2b6622a6  
    8080    echo "Building BarnOwl version $VERS"
    8181
     82    opt_rpath="-Wl,-R"
     83    [ $(uname) = "SunOS" ] && opt_rpath="-R"
     84
    8285    BARNOWL="/afs/sipb.mit.edu/project/barnowl/arch/$ATHENA_SYS"
    8386    export PKG_CONFIG_PATH="$BARNOWL/lib/pkgconfig"
    8487
    8588    CFLAGS="-I$BARNOWL/include" \
    86         LDFLAGS="-L$BARNOWL/lib -Wl,-R$BARNOWL/lib" \
     89        LDFLAGS="-L$BARNOWL/lib $opt_rpath$BARNOWL/lib" \
    8790        ./configure --exec-prefix="/mit/barnowl/arch/$ATHENA_SYS" \
    8891        --prefix="/mit/barnowl/builds/barnowl-$VERS" --mandir=/mit/barnowl/man \
Note: See TracChangeset for help on using the changeset viewer.