Bug 1286089 - Ensure servo can be linked properly for different compilers. r?glandium
MozReview-Commit-ID: 71NofEtZx6B
--- a/old-configure.in
+++ b/old-configure.in
@@ -5580,19 +5580,23 @@ MOZ_ARG_WITH_STRING(servo,
[ --with-servo=SERVO_TARGET_DIR
Absolute path of the target directory where libgeckoservo can
be found. This is generally servo_src_dir/target/release.
Passing this flag enables experimental integration with the
servo style system],
SERVO_TARGET_DIR=$withval,
SERVO_TARGET_DIR=)
if test -n "$SERVO_TARGET_DIR"; then
- MOZ_SERVO_LIBS="-L${SERVO_TARGET_DIR} -lgeckoservo"
- AC_DEFINE(MOZ_STYLO)
- AC_SUBST_LIST(MOZ_SERVO_LIBS)
+ if test -n "$_WIN32_MSVC"; then
+ MOZ_SERVO_LIBS="${SERVO_TARGET_DIR}/geckoservo"
+ else
+ MOZ_SERVO_LIBS="-L${SERVO_TARGET_DIR} -lgeckoservo"
+ fi
+ AC_DEFINE(MOZ_STYLO)
+ AC_SUBST_LIST(MOZ_SERVO_LIBS)
fi
dnl ========================================================
dnl =
dnl = Misc. Options
dnl =
dnl ========================================================
MOZ_ARG_HEADER(Misc. Options)