diff options
| author |  Abhishek Arya <inferno@chromium.org> | 2020-05-21 17:37:02 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2020-05-21 17:37:02 -0700 |
| commit | f8a00efe4c71ced9472551f118cce91295605932 (patch) | |
| tree | f2957fe3d67ec40d3ddfe55335b099a460ad2c73 /infra/base-images/base-builder/compile | |
| parent | e360d35bda98d52b5f87bab8257a4cbf5839891f (diff) | |
Don't add Rust sanitizer flags when using ubsan or i386. (#3862)
Rust sanitizer flags are not supported for these configs.
Fixes Cras and ecc-diff-fuzzer builds.
Diffstat (limited to 'infra/base-images/base-builder/compile')
| -rwxr-xr-x | infra/base-images/base-builder/compile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/infra/base-images/base-builder/compile b/infra/base-images/base-builder/compile index a05d320d..8e0342ca 100755 --- a/infra/base-images/base-builder/compile +++ b/infra/base-images/base-builder/compile @@ -67,7 +67,11 @@ fi # use RUSTFLAGS. # FIXME: Support code coverage once support is in. # See https://github.com/rust-lang/rust/issues/34701. -export RUSTFLAGS="--cfg fuzzing -Zsanitizer=${SANITIZER} -Cdebuginfo=1 -Cforce-frame-pointers" +if [ "$SANITIZER" != "undefined" ] && [ "$ARCHITECTURE" != 'i386' ]; then + export RUSTFLAGS="--cfg fuzzing -Zsanitizer=${SANITIZER} -Cdebuginfo=1 -Cforce-frame-pointers" +else + export RUSTFLAGS="--cfg fuzzing -Cdebuginfo=1 -Cforce-frame-pointers" +fi # Add Rust libfuzzer flags. # See https://github.com/rust-fuzz/libfuzzer/blob/master/build.rs#L12. |