зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 691de0626040 (bug 1569370) as per Nathan's request. CLOSED TREE
This commit is contained in:
Razvan Maries
Родитель
9390d776f3
Коммит
81bbc79be4
|
|
@ -9,7 +9,6 @@ MOZ_REQUIRE_SIGNING=0
|
|||
ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
|
||||
|
||||
. $topsrcdir/build/mozconfig.stylo
|
||||
. $topsrcdir/build/mozconfig.wasm-sandboxing
|
||||
|
||||
# ASan specific options on Linux
|
||||
ac_add_options --enable-valgrind
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
# This file is sourced by the nightly, beta, and release mozconfigs.
|
||||
|
||||
. $topsrcdir/build/mozconfig.stylo
|
||||
. $topsrcdir/build/mozconfig.wasm-sandboxing
|
||||
|
||||
ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
|
||||
ac_add_options --with-google-location-service-api-keyfile=/builds/gls-gapi.data
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
ac_add_options --enable-debug
|
||||
|
||||
. $topsrcdir/build/mozconfig.stylo
|
||||
. $topsrcdir/build/mozconfig.wasm-sandboxing
|
||||
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ ac_add_options --enable-debug
|
|||
ac_add_options --enable-optimize="-O1"
|
||||
|
||||
. $topsrcdir/build/mozconfig.stylo
|
||||
. $topsrcdir/build/mozconfig.wasm-sandboxing
|
||||
|
||||
# ASan specific options on Linux
|
||||
ac_add_options --enable-valgrind
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
ac_add_options --enable-debug
|
||||
|
||||
. $topsrcdir/build/mozconfig.stylo
|
||||
. $topsrcdir/build/mozconfig.wasm-sandboxing
|
||||
|
||||
MOZ_AUTOMATION_L10N_CHECK=0
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ MOZ_AUTOMATION_CHECK=0
|
|||
ac_add_options --enable-debug
|
||||
|
||||
. $topsrcdir/build/mozconfig.stylo
|
||||
. $topsrcdir/build/mozconfig.wasm-sandboxing
|
||||
|
||||
# Use Clang as specified in manifest
|
||||
export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ MOZ_AUTOMATION_L10N_CHECK=0
|
|||
ac_add_options --enable-debug
|
||||
|
||||
. $topsrcdir/build/mozconfig.stylo
|
||||
. $topsrcdir/build/mozconfig.wasm-sandboxing
|
||||
|
||||
# Use Clang as specified in manifest
|
||||
export CC="$MOZ_FETCHES_DIR/clang/bin/clang"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ ac_add_options --disable-debug
|
|||
ac_add_options --enable-optimize="-O2 -gline-tables-only"
|
||||
|
||||
. $topsrcdir/build/mozconfig.stylo
|
||||
. $topsrcdir/build/mozconfig.wasm-sandboxing
|
||||
|
||||
# ASan specific options on Linux
|
||||
ac_add_options --enable-valgrind
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ MOZ_REQUIRE_SIGNING=0
|
|||
ac_add_options "MOZ_ALLOW_LEGACY_EXTENSIONS=1"
|
||||
|
||||
. $topsrcdir/build/mozconfig.stylo
|
||||
. $topsrcdir/build/mozconfig.wasm-sandboxing
|
||||
|
||||
# ASan specific options on Linux
|
||||
ac_add_options --enable-valgrind
|
||||
|
|
|
|||
|
|
@ -1,12 +1,6 @@
|
|||
export TOOLTOOL_DIR="$topsrcdir"
|
||||
export LLVM_CONFIG="${MOZ_FETCHES_DIR}/clang/bin/llvm-config"
|
||||
|
||||
export WASM_SANDBOXED_LIBRARIES=graphite
|
||||
export LUCETC="${MOZ_FETCHES_DIR}/lucetc/lucetc"
|
||||
export WASI_SYSROOT="${MOZ_FETCHES_DIR}/wasi-sysroot/share/wasi-sysroot"
|
||||
export WASM_CC="${MOZ_FETCHES_DIR}/clang/bin/clang --target=wasm32-wasi"
|
||||
export WASM_CXX="${MOZ_FETCHES_DIR}/clang/bin/clang++ --target=wasm32-wasi"
|
||||
|
||||
CARGO="${MOZ_FETCHES_DIR}/rustc/bin/cargo"
|
||||
RUSTC="${MOZ_FETCHES_DIR}/rustc/bin/rustc"
|
||||
RUSTDOC="${MOZ_FETCHES_DIR}/rustc/bin/rustdoc"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ ac_add_options --disable-debug
|
|||
ac_add_options --enable-optimize="-O2 -gline-tables-only"
|
||||
|
||||
. $topsrcdir/build/mozconfig.stylo
|
||||
. $topsrcdir/build/mozconfig.wasm-sandboxing
|
||||
|
||||
. $topsrcdir/build/unix/mozconfig.tsan
|
||||
ac_add_options --disable-elf-hack
|
||||
|
|
|
|||
|
|
@ -38,9 +38,3 @@ unset AR
|
|||
unset NM
|
||||
unset RANLIB
|
||||
unset NASM
|
||||
|
||||
unset WASM_SANDBOXED_LIBRARIES
|
||||
unset WASM_CC
|
||||
unset WASM_CXX
|
||||
unset LUCETC
|
||||
unset WASI_SYSROOT
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
# Tell the build system about bits to build sandboxed wasm libraries.
|
||||
case "$PERFHERDER_EXTRA_OPTIONS" in
|
||||
base-toolchains*)
|
||||
# Clang versions < 8.0 don't support wasm.
|
||||
;;
|
||||
*)
|
||||
export WASM_SANDBOXED_LIBRARIES=graphite
|
||||
export WASM_CC="${MOZ_FETCHES_DIR}/clang/bin/clang --target=wasm32-wasi"
|
||||
export WASM_CXX="${MOZ_FETCHES_DIR}/clang/bin/clang++ --target=wasm32-wasi"
|
||||
export LUCETC="${MOZ_FETCHES_DIR}/lucetc/lucetc"
|
||||
export WASI_SYSROOT="${MOZ_FETCHES_DIR}/wasi-sysroot/share/wasi-sysroot"
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1774,7 +1774,6 @@ def wasm_sandboxing_libraries():
|
|||
return ('graphite',)
|
||||
|
||||
option('--with-wasm-sandboxed-libraries',
|
||||
env='WASM_SANDBOXED_LIBRARIES',
|
||||
help='Enable wasm sandboxing for the selected libraries',
|
||||
nargs='+',
|
||||
choices=dependable(wasm_sandboxing_libraries))
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче