VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-12-18 11:06:58 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-12-25 23:00:03 (GMT)
commit3d978c31a7fd37d633ca2baf749b2e9f187a0b8f (patch)
tree9d8151ff0cccdefbcfd5dacab67636b3d3a086d3 /src/Makefile
parent9b0669da2980f53d5f1c3d3017bd182a9d367281 (diff)
downloadVeraCrypt-3d978c31a7fd37d633ca2baf749b2e9f187a0b8f.zip
VeraCrypt-3d978c31a7fd37d633ca2baf749b2e9f187a0b8f.tar.gz
MacOSX: use Yasm to build Twofish 64-bit assembly code on OSX since native compiler doesn't support GAS syntax
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile
index 00e6e5b..dea172f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -39,6 +39,7 @@ export AR ?= ar
export CC ?= gcc
export CXX ?= g++
export AS := nasm
+export YASM := yasm
export RANLIB ?= ranlib
export CFLAGS := -Wall
@@ -251,6 +252,7 @@ ifeq "$(shell uname -s)" "Darwin"
endif
AS := $(BASE_DIR)/Build/Tools/MacOSX/nasm
+ YASM := $(BASE_DIR)/Build/Tools/MacOSX/yasm
ASFLAGS += --prefix _
ifeq "$(TC_BUILD_CONFIG)" "Release"