1diff -ur misc/nss-3.39/nss/lib/sqlite/config.mk misc/build/nss-3.39/nss/lib/sqlite/config.mk
2--- misc/nss-3.39/nss/lib/sqlite/config.mk 2018-08-31 05:55:53.000000000 -0700
3+++ misc/build/nss-3.39/nss/lib/sqlite/config.mk 2018-09-10 10:36:01.074375000 -0700
4@@ -35,9 +35,9 @@
5 # OSAtomicCompareAndSwapPtrBarrier, which is only available on Mac OS X 10.5
6 # (Darwin 9.0) and later. Define SQLITE_WITHOUT_ZONEMALLOC to disable
7 # that code for older versions of Mac OS X. See bug 820374.
8-DARWIN_VER_MAJOR := $(shell uname -r | cut -f1 -d.)
9-DARWIN_LT_9 := $(shell [ $(DARWIN_VER_MAJOR) -lt 9 ] && echo true)
10-ifeq ($(DARWIN_LT_9),true)
11+OSX_TARGET_MINOR := $(shell echo $(MACOSX_DEPLOYMENT_TARGET) | cut -f2 -d.)
12+OSX_MINOR_LT_5 := $(shell [ $(OSX_TARGET_MINOR) -lt 5 ] && echo true)
13+ifeq ($(OSX_MINOR_LT_5),true)
14 OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC
15 endif
16 endif # Darwin
| 1diff -ur misc/nss-3.39/nss/lib/sqlite/config.mk misc/build/nss-3.39/nss/lib/sqlite/config.mk
2--- misc/nss-3.39/nss/lib/sqlite/config.mk 2018-08-31 05:55:53.000000000 -0700
3+++ misc/build/nss-3.39/nss/lib/sqlite/config.mk 2018-09-10 10:36:01.074375000 -0700
4@@ -35,9 +35,9 @@
5 # OSAtomicCompareAndSwapPtrBarrier, which is only available on Mac OS X 10.5
6 # (Darwin 9.0) and later. Define SQLITE_WITHOUT_ZONEMALLOC to disable
7 # that code for older versions of Mac OS X. See bug 820374.
8-DARWIN_VER_MAJOR := $(shell uname -r | cut -f1 -d.)
9-DARWIN_LT_9 := $(shell [ $(DARWIN_VER_MAJOR) -lt 9 ] && echo true)
10-ifeq ($(DARWIN_LT_9),true)
11+OSX_TARGET_MINOR := $(shell echo $(MACOSX_DEPLOYMENT_TARGET) | cut -f2 -d.)
12+OSX_MINOR_LT_5 := $(shell [ $(OSX_TARGET_MINOR) -lt 5 ] && echo true)
13+ifeq ($(OSX_MINOR_LT_5),true)
14 OS_CFLAGS += -DSQLITE_WITHOUT_ZONEMALLOC
15 endif
16 endif # Darwin
|
| 17--- misc/nss-3.39/nss/coreconf/UNIX.mk 2021-09-07 01:32:04.000000000 -0400
18+++ misc/build/nss-3.39/nss/coreconf/UNIX.mk 2021-09-07 01:32:11.000000000 -0400
19@@ -63,4 +63,4 @@
20 if test ! -d $(@D); then rm -rf $(@D); $(NSINSTALL) -D $(@D); fi
21 endef
22
23-include $(CORE_DEPTH)/coreconf/Werror.mk
24+#include $(CORE_DEPTH)/coreconf/Werror.mk
25--- misc/nss-3.39/nss/coreconf/Darwin.mk 2021-09-07 14:24:22.000000000 -0400
26+++ misc/build/nss-3.39/nss/coreconf/Darwin.mk 2021-09-07 14:24:30.000000000 -0400
27@@ -8,6 +8,9 @@
28 RANLIB ?= ranlib
29
30 include $(CORE_DEPTH)/coreconf/UNIX.mk
31-include $(CORE_DEPTH)/coreconf/Werror.mk
32+#include $(CORE_DEPTH)/coreconf/Werror.mk
33+
34+CXXFLAGS += -stdlib=libc++
35+LDFLAGS += -stdlib=libc++
36
37 DEFAULT_COMPILER = gcc
38@@ -108,7 +111,7 @@
39 # May override this with different compatibility and current version numbers.
40 DARWIN_DYLIB_VERSIONS = -compatibility_version 1 -current_version 1
41 # May override this with -bundle to create a loadable module.
42-DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names
43+DSO_LDOPTS = -dynamiclib $(DARWIN_DYLIB_VERSIONS) -install_name @executable_path/$(notdir $@) -headerpad_max_install_names -stdlib=libc++
44
45 ifdef USE_GCOV
46 OS_CFLAGS += --coverage
|