Merge in default

doc_update_sequoia
Damiano Boppart 2017-08-28 14:35:16 +02:00
commit 945f478934
3 changed files with 8 additions and 4 deletions

View File

@ -19,8 +19,8 @@ ifdef DEBUG
else
CFLAGS+= -O3 -DNDEBUG
endif
# '-Wno-cpp' is required to suppress the warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" otherwise printed during the compilation of every asn1c-generated C file.
CFLAGS_GENERATED=-Wno-cpp
# The '_DEFAULT_SOURCE' feature test macro is required to suppress the warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" otherwise printed during the compilation of every asn1c-generated C file. It's a glibc specific warning, only present in few versions around ~2.19. See https://lwn.net/Articles/590381/ for a discussion.
CFLAGS_GENERATED=-D_DEFAULT_SOURCE
######### C++ #########
CXX=g++ -std=gnu++11 -pthread

View File

@ -13,8 +13,7 @@ NO_SOURCE=
ifeq ($(BUILD_ON),Darwin)
ifeq ($(BUILD_FOR),Darwin)
CFLAGS+= -DSQLITE_THREADSAFE=1
#LDFLAGS+= -L/opt/local/lib
LDLIBS+= -lsqlite3 -lz -liconv
LDLIBS+= -lz -liconv
else
$(error I don't know how to make for $(BUILD_FOR) on $(BUILD_ON))
endif
@ -32,6 +31,7 @@ endif
ifdef SQLITE3_FROM_OS
NO_SOURCE+= sqlite3.c
CFLAGS+= -DSQLITE3_FROM_OS
LDLIBS+= -lsqlite3
endif
ifeq ($(OPENPGP),GPG)

View File

@ -24,6 +24,10 @@ ifeq ($(OPENPGP),NETPGP)
LDLIBS+= -lnetpgp
endif
ifdef SQLITE3_FROM_OS
LDLIBS+= -lsqlite3
endif
ifeq ($(shell uname),Darwin)
LIBPATH=DYLD_LIBRARY_PATH
LLDB_BIN=/Applications/Xcode.app/Contents/Developer/usr/bin/lldb