auto merge of #951 : kmcallister/servo/debug-skia, r=metajack

Fixes #921.

4 files changed, 21 insertions, 6 deletions

diff --git a/Makefile.in b/Makefile.in
index 906c084bc07..cfd3caddd77 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -53,6 +53,7 @@ export CFG_RUSTC
 export CFG_RUSTC_FLAGS
 export CFG_LOCAL_RUSTC
 export CFG_ENABLE_DEBUG
+export CFG_ENABLE_DEBUG_SKIA
 export RUSTC=$(CFG_RUSTC)
 export RUSTFLAGS=$(CFG_RUSTC_FLAGS)
 export CC=$(CFG_CC)
diff --git a/configure b/configure
index e035ef4a77c..7ed1f2d00c4 100755
--- a/configure
+++ b/configure
@@ -320,7 +320,8 @@ opt optimize 1 "build optimized rust code"
 opt optimize-cxx 1 "build optimized C++ code"
 opt manage-submodules 1 "let the build manage the git submodules"
 opt fast-make 0 "use .gitmodules as timestamp for submodule deps"
-opt debug 0 "use debugging symbols"
+opt debug 0 "build with debugging code and symbols"
+opt debug-skia 0 "build Skia and Azure for debugging (significant performance hit)"
 valopt local-rust-root "" "set prefix for local rust binary"
 valopt target-triples "${DEFAULT_TARGET_TRIPLE}" "target triple to be compiled"
 valopt android-cross-path "/opt/ndk_standalone" "Android NDK cross compiler path"
@@ -554,6 +555,7 @@ putvar CFG_PATH
 putvar CFG_LOCAL_RUSTC
 putvar CFG_LOCAL_RUST_ROOT
 putvar CFG_ENABLE_DEBUG
+putvar CFG_ENABLE_DEBUG_SKIA
 
 msg
 copy_if_changed ${CFG_SRC_DIR}Makefile.in ${CFG_BUILD_HOME}Makefile
@@ -634,10 +636,7 @@ do
     CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/configure"
     CONFIGURE_ARGS=""
     ENV_VARS=""
-
-    if [ ! -z $CFG_ENABLE_DEBUG ]; then
-        CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-debug"
-    fi
+    ENABLE_DEBUG="$CFG_ENABLE_DEBUG"
 
     case $i in
         support/nss/nspr)
@@ -688,14 +687,29 @@ do
                 CONFIGURE_ARGS="${CONFIGURE_ARGS} --with-android-ndk=${CFG_ANDROID_NDK_PATH}"
             fi
             ;;
+        support/skia/skia)
+            # Right now the skia configure script actually ignores --enable-debug and the
+            # build looks only at CFG_ENABLE_DEBUG_SKIA exported from our Makefile.  But we
+            # still refrain from passing --enable-debug if we didn't get --enable-debug-skia,
+            # in order to be more future-proof.
+            #
+            # The same applies to rust-azure below.  Also note that the two libraries won't
+            # link if one is built with debugging and the other isn't.
+            ENABLE_DEBUG="$CFG_ENABLE_DEBUG_SKIA"
+            ;;
         support/azure/rust-azure)
-                # needed because Azure's configure wants "--enable-skia"
+            # needed because Azure's configure wants "--enable-skia"
             CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-skia"
+            ENABLE_DEBUG="$CFG_ENABLE_DEBUG_SKIA"
             ;;
         *)
             ;;
     esac
 
+    if [ -n "$ENABLE_DEBUG" ]; then
+        CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-debug"
+    fi
+
     if [ -f ${CONFIGURE_SCRIPT} ]
     then
 	(sh ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}) || exit $?
diff --git a/src/support/azure/rust-azure b/src/support/azure/rust-azure
-Subproject 35d8fdac4ccb967a510db2feecb5bd3aa810a2a
+Subproject b1f08f81b862f92d6391580425d5f568e59e9f2
diff --git a/src/support/skia/skia b/src/support/skia/skia
-Subproject db2cd9398c25f4d061d536e3cb53a0a3005ccb8
+Subproject e028df53bd31057f1e7dfc933cbe832df2972f5