Permalink
Browse files

Bug 633699: Fix for windows spidermonkey builds. r=pbiggar

  • Loading branch information...
1 parent b0ee6ec commit 96b207535ebab3a35bc9f32e26e16a5503d53d55 @catlee catlee committed Feb 17, 2011
Showing with 6 additions and 1 deletion.
  1. +6 −1 scripts/spidermonkey_builds/spidermonkey.sh
@@ -86,7 +86,12 @@ test -d js || mkdir js
cd js
NSPR_CFLAGS=$($OBJDIR/dist/bin/nspr-config --cflags)
-NSPR_LIBS=$($OBJDIR/dist/bin/nspr-config --libs)
+if [ "$OSTYPE" = "msys" ]; then
+ NSPR_LIBS="$OBJDIR/dist/lib/plds4.lib $OBJDIR/dist/lib/plc4.lib $OBJDIR/dist/lib/nspr4.lib"
+ export PATH="$OBJDIR/dist/lib:${PATH}"
+else
+ NSPR_LIBS=$($OBJDIR/dist/bin/nspr-config --libs)
+fi
../../src/js/src/configure $CONFIGURE_ARGS --with-dist-dir=$OBJDIR/dist --prefix=$OBJDIR/dist --with-nspr-prefix=$OBJDIR/dist --with-nspr-cflags="$NSPR_CFLAGS" --with-nspr-libs="$NSPR_LIBS" || exit 2
make || exit 2

0 comments on commit 96b2075

Please sign in to comment.