diff options
| author |  DavidKorczynski <david@adalogics.com> | 2022-04-15 19:13:24 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-04-15 19:13:24 +0100 |
| commit | f9600a44e30907b5e464b1d1c33557cc181635fb (patch) | |
| tree | 5d2423e69ced2491d76fc50c595abab7e795a0a0 | |
| parent | 6fad9b7397197c002d8a1821602466dcc9b72fdf (diff) | |
fuzz-introspector: remove use of LDFLAGS (#7573)
* fuzz-introspector: remove use of LDFLAGS
The use of LDFLAGS does not really follow the policy of OSS-Fuzz. This
moves the linker flags into the sanitizer flags.
Ref:
https://github.com/google/oss-fuzz/issues/7540#issuecomment-1094500094
| -rw-r--r-- | infra/base-images/base-builder/Dockerfile | 2 | ||||
| -rwxr-xr-x | infra/base-images/base-builder/compile | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/infra/base-images/base-builder/Dockerfile b/infra/base-images/base-builder/Dockerfile index 276300df..2230f2c4 100644 --- a/infra/base-images/base-builder/Dockerfile +++ b/infra/base-images/base-builder/Dockerfile @@ -83,7 +83,7 @@ ENV SANITIZER_FLAGS_dataflow "-fsanitize=dataflow" ENV SANITIZER_FLAGS_thread "-fsanitize=thread" -ENV SANITIZER_FLAGS_introspector "-flegacy-pass-manager -flto -fno-inline-functions" +ENV SANITIZER_FLAGS_introspector "-flegacy-pass-manager -flto -fno-inline-functions -Wl,-fuse-ld=gold,-flto -Wno-unused-command-line-argument" # Do not use any sanitizers in the coverage build. ENV SANITIZER_FLAGS_coverage "" diff --git a/infra/base-images/base-builder/compile b/infra/base-images/base-builder/compile index b11649fd..b6c78e8d 100755 --- a/infra/base-images/base-builder/compile +++ b/infra/base-images/base-builder/compile @@ -147,7 +147,6 @@ if [ "$FUZZING_LANGUAGE" = "jvm" ]; then fi if [ "$SANITIZER" = "introspector" ]; then - export LDFLAGS="-fuse-ld=gold -flto" export AR=llvm-ar export NM=llvm-nm export RANLIB=llvm-ranlib |