diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-11-27 15:54:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 15:54:16 +0100 |
| commit | d4d1fba03546f9701c6e3c45f3f866cc265adc33 (patch) | |
| tree | ddef08c3e88f0b7a263f73d94f304cd2a70e5379 /src | |
| parent | 7ed41b3fde99ddfbd20fefa2accb54193bba8f9a (diff) | |
| parent | 5800d245e5952ee580c2ec8c15ac4a694724af7e (diff) | |
| download | VeraCrypt-d4d1fba03546f9701c6e3c45f3f866cc265adc33.tar.gz VeraCrypt-d4d1fba03546f9701c6e3c45f3f866cc265adc33.zip | |
Merge pull request #230 from bmintz/issue-198
Fix compilation on Linux (closes #198)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 7d7f69db..4f8bb42b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -170,8 +170,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/'` \>= 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/'` \>= 40300) + 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) ifeq "$(GCC_GTEQ_440)" "1" CFLAGS += -maes CXXFLAGS += -maes |