diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-06-26 16:53:12 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2017-06-27 00:55:22 +0200 |
| commit | 3d8260d3d3243ff5747b846cde296642156f51b0 (patch) | |
| tree | c12fe1bfa0c8619a3dbdafbc3fd1d7411b30c0ae /src/Makefile | |
| parent | e8bafa6a378852977326c060c505b6487232664b (diff) | |
| download | VeraCrypt-3d8260d3d3243ff5747b846cde296642156f51b0.tar.gz VeraCrypt-3d8260d3d3243ff5747b846cde296642156f51b0.zip | |
MacOSX: various changes for assembly files build. Don't use 32-bit assembly code of SHA-512 since it is not compatible with PIE configuration of OSX compiler (absolute addressing used)
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile index c09828a5..3e8a9e32 100644 --- a/src/Makefile +++ b/src/Makefile @@ -44,7 +44,7 @@ export RANLIB ?= ranlib export CFLAGS := -Wall export CXXFLAGS := -Wall -Wno-unused-parameter C_CXX_FLAGS := -MMD -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGE_FILES -I$(BASE_DIR) -I$(BASE_DIR)/Crypto -export ASFLAGS := -D __GNUC__ +export ASFLAGS := -D __GNUC__ -D __YASM__ export LFLAGS := export PKG_CONFIG_PATH ?= /usr/local/lib/pkgconfig @@ -251,8 +251,8 @@ ifeq "$(shell uname -s)" "Darwin" endif AS := $(BASE_DIR)/Build/Tools/MacOSX/yasm - export ASFLAGS32 := -D __GNUC__ -D __BITS__=32 --prefix _ -f macho32 - export ASFLAGS64 := -D __GNUC__ -D __BITS__=64 --prefix _ -f macho64 + export ASFLAGS32 := -D __GNUC__ -D __YASM__ -D __BITS__=32 --prefix=_ -f macho32 + export ASFLAGS64 := -D __GNUC__ -D __YASM__ -D __BITS__=64 --prefix=_ -f macho64 ifeq "$(TC_BUILD_CONFIG)" "Release" |