Merge pull request #283 from apjanke-build-on-mac-darnit

This commit is contained in:
Karel Miko 2017-09-14 17:14:28 +02:00
commit c908eb16bb
4 changed files with 4 additions and 9 deletions

View File

@ -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 |

View File

@ -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

View File

@ -102,7 +102,7 @@ endif # COMPILE_DEBUG
ifneq ($(findstring clang,$(CC)),)
LTC_CFLAGS += -Wno-typedef-redefinition -Wno-tautological-compare -Wno-builtin-requires-header
LTC_CFLAGS += -Wno-typedef-redefinition -Wno-tautological-compare -Wno-builtin-requires-header -Wno-missing-field-initializers
endif
ifeq ($(PLATFORM), Darwin)
LTC_CFLAGS += -Wno-nullability-completeness

View File

@ -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$ */