Skip to content

Commit

Permalink
initialize ltc_mp to force allocation under all compilers, including …
Browse files Browse the repository at this point in the history
…clang on macOS
  • Loading branch information
apjanke authored and karel-m committed Sep 14, 2017
1 parent 32d60ac commit cfce691
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ There are several `makefile`s provided. Please choose the one that fits best for

| makefile | use-case |
| -------- | -------- |
| `makefile` | builds a static library (GNU Make required, broken on Mac OSX - use `makefile.unix` instead) |
| `makefile` | builds a static library (GNU Make required) |
| `makefile.shared` | builds a shared (and static) library (GNU Make required) |
| `makefile.unix` | for unusual UNIX platforms, or if you do not have GNU Make |
| `makefile.mingw` | for usage with the mingw compiler on MS Windows |
Expand Down
6 changes: 0 additions & 6 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ endif

PLATFORM := $(shell uname | sed -e 's/_.*//')

ifneq ($(MAKECMDGOALS),clean)
ifeq ($(PLATFORM), Darwin)
$(error Known to not work on Mac, please use makefile.unix for static libraries or makefile.shared for shared libraries)
endif
endif

# ranlib tools
ifndef RANLIB
RANLIB:=$(CROSS_COMPILE)ranlib
Expand Down
3 changes: 2 additions & 1 deletion src/misc/crypt/crypt_ltc_mp_descriptor.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
*/
#include "tomcrypt.h"

ltc_math_descriptor ltc_mp;
/* Initialize ltc_mp to nulls, to force allocation on all platforms, including macOS. */
ltc_math_descriptor ltc_mp = { 0 };

/* ref: $Format:%D$ */
/* git commit: $Format:%H$ */
Expand Down

0 comments on commit cfce691

Please sign in to comment.