VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbmintz <bmintz@users.noreply.github.com>2017-11-07 03:05:21 (GMT)
committerbmintz <bmintz@users.noreply.github.com>2017-11-07 03:05:21 (GMT)
commit5800d245e5952ee580c2ec8c15ac4a694724af7e (patch)
treeb377739eff2c1876ac1c752e8e69302f10dda877
parent6575ce3e9ee423c3c91f0e44d3bca365a338418a (diff)
downloadVeraCrypt-5800d245e5952ee580c2ec8c15ac4a694724af7e.zip
VeraCrypt-5800d245e5952ee580c2ec8c15ac4a694724af7e.tar.gz
Fix compilation on Linux (closes #198)refs/pull/230/head
This patch was provided by Krytarik Raido via unit93 https://github.com/veracrypt/VeraCrypt/issues/198#issuecomment-341453420
-rw-r--r--src/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index 7d7f69d..4f8bb42 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