mirror of
https://github.com/DaveGamble/cJSON.git
synced 2023-08-10 21:13:26 +03:00
Merge pull request #351 from GitMensch/patch-1
allow to override PIC_FLAGS and compiler std
This commit is contained in:
commit
18b7113b49
5
Makefile
5
Makefile
@ -24,6 +24,8 @@ INSTALL_LIBRARY_PATH = $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
|
|||||||
|
|
||||||
INSTALL ?= cp -a
|
INSTALL ?= cp -a
|
||||||
|
|
||||||
|
CC = gcc -std=c89
|
||||||
|
|
||||||
# validate gcc version for use fstack-protector-strong
|
# validate gcc version for use fstack-protector-strong
|
||||||
MIN_GCC_VERSION = "4.9"
|
MIN_GCC_VERSION = "4.9"
|
||||||
GCC_VERSION := "`$(CC) -dumpversion`"
|
GCC_VERSION := "`$(CC) -dumpversion`"
|
||||||
@ -34,7 +36,8 @@ else
|
|||||||
CFLAGS += -fstack-protector
|
CFLAGS += -fstack-protector
|
||||||
endif
|
endif
|
||||||
|
|
||||||
R_CFLAGS = -fPIC -std=c89 -pedantic -Wall -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes -Wstrict-overflow=2 -Wcast-qual -Wc++-compat -Wundef -Wswitch-default -Wconversion $(CFLAGS)
|
PIC_FLAGS = -fPIC
|
||||||
|
R_CFLAGS = $(PIC_FLAGS) -pedantic -Wall -Werror -Wstrict-prototypes -Wwrite-strings -Wshadow -Winit-self -Wcast-align -Wformat=2 -Wmissing-prototypes -Wstrict-overflow=2 -Wcast-qual -Wc++-compat -Wundef -Wswitch-default -Wconversion $(CFLAGS)
|
||||||
|
|
||||||
uname := $(shell sh -c 'uname -s 2>/dev/null || echo false')
|
uname := $(shell sh -c 'uname -s 2>/dev/null || echo false')
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user