diff options
| author | Gokturk Yuksek <gokturk@gentoo.org> | 2020-12-10 20:08:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-11 02:08:42 +0100 |
| commit | 5878486f56594c8a07449d3b876229f4493999d4 (patch) | |
| tree | 0d661dae524fb2c26056d2971a5b5f9ed0ad3599 | |
| parent | 5db0ee25ffd3b8f1cb2cb88b0cd04c9636db4183 (diff) | |
| download | VeraCrypt-5878486f56594c8a07449d3b876229f4493999d4.tar.gz VeraCrypt-5878486f56594c8a07449d3b876229f4493999d4.zip | |
src/Makefile: replace explicit calls to gcc with $(CC) (#706)
The Makefile should respect the value of CC even when performing
build-related tests.
Bug: https://bugs.gentoo.org/756787
| -rw-r--r-- | src/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index a1e1e43b..a8222727 100644 --- a/src/Makefile +++ b/src/Makefile @@ -180,8 +180,8 @@ ifeq "$(shell uname -s)" "Linux" CFLAGS += -msse2 CXXFLAGS += -msse2 - GCC_GTEQ_440 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40400) - GCC_GTEQ_430 := $(shell expr `gcc -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40300) + GCC_GTEQ_440 := $(shell expr `$(CC) -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40400) + GCC_GTEQ_430 := $(shell expr `$(CC) -dumpversion | sed -e 's/\.\([0-9][0-9]\)/\1/g' -e 's/\.\([0-9]\)/0\1/g' -e 's/^[0-9]\{3,4\}$$/&00/' -e 's/^[0-9]\{1,2\}$$/&0000/'` \>= 40300) ifeq "$(GCC_GTEQ_440)" "1" CFLAGS += -maes CXXFLAGS += -maes @@ -215,7 +215,7 @@ ifeq "$(shell uname -s)" "Linux" ifneq "$(origin WXSTATIC)" "command line" LFLAGS += -ldl else - GCC5USED := $(shell expr `gcc -dumpversion | cut -f1 -d.` \>= 5) + GCC5USED := $(shell expr `$(CC) -dumpversion | cut -f1 -d.` \>= 5) ifeq "$(GCC5USED)" "1" CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 WXCONFIG_CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0 |