Bug 1286089 - Ensure servo can be linked properly for different compilers. r=glandium
authorXidorn Quan <me@upsuper.org>
Wed, 13 Jul 2016 09:01:25 +1000
changeset 345822 875e441f8b804adaf67ad704171c8b2f04015499
parent 345821 cae3143edbd4d45359acb39fd18989ce986246e3
child 345823 6b5a1893be9137df17e9c271e0c6a3d0e15c3983
push id6389
push userraliiev@mozilla.com
push dateMon, 19 Sep 2016 13:38:22 +0000
treeherdermozilla-beta@01d67bfe6c81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1286089
milestone50.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1286089 - Ensure servo can be linked properly for different compilers. r=glandium MozReview-Commit-ID: 71NofEtZx6B
old-configure.in
--- a/old-configure.in
+++ b/old-configure.in
@@ -5520,19 +5520,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)