Changeset 2b6622a602f1f8b0922ad96976b2abc20232db9c

Timestamp:

10/24/09 21:21:54 (4 weeks ago)

Author:

Nelson Elhage <nelhage@mit.edu>

git-author:

Nelson Elhage <nelhage@mit.edu> / 2009-10-23T19:30:11Z-0400

Parents:

f9d257b7036a557ba1d61d6149c5801dbda10d41

Children:

a3e61a29065fa8b947f06870ee2a0c52108398b3

git-committer:

Nelson Elhage <nelhage@mit.edu> / 2009-10-24T21:21:54Z-0400

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>

Files:

• scripts/locker-build (modified) (1 diff)

scripts/locker-build

@@ -80 +80 @@
     echo "Building BarnOwl version $VERS"
 
+    opt_rpath="-Wl,-R"
+    [ $(uname) = "SunOS" ] && opt_rpath="-R"
+
     BARNOWL="/afs/sipb.mit.edu/project/barnowl/arch/$ATHENA_SYS"
     export PKG_CONFIG_PATH="$BARNOWL/lib/pkgconfig"
 
     CFLAGS="-I$BARNOWL/include" \
-        LDFLAGS="-L$BARNOWL/lib -Wl,-R$BARNOWL/lib" \
+        LDFLAGS="-L$BARNOWL/lib $opt_rpath$BARNOWL/lib" \
         ./configure --exec-prefix="/mit/barnowl/arch/$ATHENA_SYS" \
         --prefix="/mit/barnowl/builds/barnowl-$VERS" --mandir=/mit/barnowl/man \