mirror of
https://github.com/servo/servo.git
synced 2025-08-01 19:50:30 +01:00
configure: Control Skia debugging with a separate --enable-debug-skia
Fixes #921.
This commit is contained in:
parent
b77c3eaaa0
commit
d8667a553b
4 changed files with 23 additions and 8 deletions
|
@ -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)
|
||||
|
|
26
configure
vendored
26
configure
vendored
|
@ -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 $?
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 35d8fdac4ccb967a510db2feecb5bd3aa810a2a4
|
||||
Subproject commit b1f08f81b862f92d6391580425d5f568e59e9f26
|
|
@ -1 +1 @@
|
|||
Subproject commit db2cd9398c25f4d061d536e3cb53a0a3005ccb87
|
||||
Subproject commit e028df53bd31057f1e7dfc933cbe832df2972f5b
|
Loading…
Add table
Add a link
Reference in a new issue