diff options
| author | Peter Jones <pjones@redhat.com> | 2021-03-11 11:40:24 -0500 |
|---|---|---|
| committer | Javier Martinez Canillas <javier@dowhile0.org> | 2021-03-12 10:15:01 +0100 |
| commit | 6ebae16cbb6856f80e891b710d4f76b49ff48c6d (patch) | |
| tree | 374087f425991cd4721bdee32f43af2e58d0185f | |
| parent | 4f87debd87c2199df52f76504328be949c07e3f5 (diff) | |
| download | efi-boot-shim-6ebae16cbb6856f80e891b710d4f76b49ff48c6d.tar.gz efi-boot-shim-6ebae16cbb6856f80e891b710d4f76b49ff48c6d.zip | |
Fix the compiler when invoking scan-build/fanalyzer/etc
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | include/coverity.mk | 6 | ||||
| -rw-r--r-- | include/fanalyzer.mk | 8 | ||||
| -rw-r--r-- | include/scan-build.mk | 8 |
3 files changed, 7 insertions, 15 deletions
diff --git a/include/coverity.mk b/include/coverity.mk index e1e5c874..93d83853 100644 --- a/include/coverity.mk +++ b/include/coverity.mk @@ -9,10 +9,7 @@ define prop $(if $(findstring undefined,$(origin $(1))),,$(1)="$($1)") endef -override CCACHE_DISABLE := 1 -export CCACHE_DISABLE - -PROPOGATE_MAKE_FLAGS = ARCH ARCH_SUFFIX COLOR COMPILER CROSS_COMPILE +PROPOGATE_MAKE_FLAGS = ARCH ARCH_SUFFIX COLOR CC COMPILER CROSS_COMPILE MAKEARGS = $(foreach x,$(PROPOGATE_MAKE_FLAGS),$(call prop,$(x))) @@ -42,6 +39,7 @@ cov-build-unchecked-cryptlib : Cryptlib/libcryptlib.a cov-build-unchecked-openssl : | clean-openssl-objs cov-build-unchecked-openssl : Cryptlib/OpenSSL/libopenssl.a +cov-build-all : CCACHE_DISABLE=1 cov-build-all : | clean clean-shim-objs clean-cryptlib-objs clean-openssl-objs +cov-build --dir cov-int $(MAKE) $(MAKEARGS) CCACHE_DISABLE=1 all diff --git a/include/fanalyzer.mk b/include/fanalyzer.mk index 7e31a082..e0bf4d75 100644 --- a/include/fanalyzer.mk +++ b/include/fanalyzer.mk @@ -6,12 +6,7 @@ define prop $(if $(findstring undefined,$(origin $(1))),,$(eval export $(1))) endef -override CCACHE_DISABLE := 1 -export CCACHE_DISABLE -override COMPILER := gcc -export COMPILER - -PROPOGATE_MAKE_FLAGS = ARCH ARCH_SUFFIX COLOR COMPILER CROSS_COMPILE DASHJ +PROPOGATE_MAKE_FLAGS = ARCH ARCH_SUFFIX COLOR CC COMPILER CROSS_COMPILE DASHJ MAKEARGS = $(foreach x,$(PROPOGATE_MAKE_FLAGS),$(call prop,$(x))) @@ -22,6 +17,7 @@ fanalyzer-build-unchecked-cryptlib : Cryptlib/libcryptlib.a fanalyzer-build-unchecked-openssl : Cryptlib/OpenSSL/libopenssl.a +fanalyzer-build-all : COMPILER=gcc fanalyzer-build-all : CCACHE_DISABLE=1 fanalyzer-build-all : FEATUREFLAGS+=-fanalyzer fanalyzer-build-all : WERRFLAGS=-Werror=analyzer-null-dereference diff --git a/include/scan-build.mk b/include/scan-build.mk index 2cb33e79..3ed7660e 100644 --- a/include/scan-build.mk +++ b/include/scan-build.mk @@ -6,11 +6,7 @@ define prop $(if $(findstring undefined,$(origin $(1))),,$(1)="$($1)") endef -override CCACHE_DISABLE := 1 -export CCACHE_DISABLE -override COMPILER = clang - -PROPOGATE_MAKE_FLAGS = ARCH ARCH_SUFFIX COLOR COMPILER CROSS_COMPILE DASHJ +PROPOGATE_MAKE_FLAGS = ARCH ARCH_SUFFIX COLOR CC COMPILER CROSS_COMPILE DASHJ MAKEARGS = $(foreach x,$(PROPOGATE_MAKE_FLAGS),$(call prop,$(x))) @@ -24,6 +20,8 @@ scan-build-unchecked-cryptlib : Cryptlib/libcryptlib.a scan-build-unchecked-openssl : Cryptlib/OpenSSL/libopenssl.a +scan-build-all : CCACHE_DISABLE=1 +scan-build-all : COMPILER=clang scan-build-all : | scan-test scan-build-all : +scan-build -o scan-results make $(MAKEARGS) $(DASHJ) CCACHE_DISABLE=1 all |