summaryrefslogtreecommitdiff
path: root/coreconf
diff options
context:
space:
mode:
Diffstat (limited to 'coreconf')
-rw-r--r--coreconf/arch.mk1
-rw-r--r--coreconf/config.mk2
2 files changed, 3 insertions, 0 deletions
diff --git a/coreconf/arch.mk b/coreconf/arch.mk
index 790372d34..cc13ced65 100644
--- a/coreconf/arch.mk
+++ b/coreconf/arch.mk
@@ -116,6 +116,7 @@ ifeq ($(OS_ARCH),Linux)
OS_RELEASE := $(word 1,$(OS_RELEASE)).$(word 2,$(OS_RELEASE))
endif
KERNEL = Linux
+ include $(CORE_DEPTH)/coreconf/Linux.mk
endif
# Since all uses of OS_ARCH that follow affect only userland, we can
diff --git a/coreconf/config.mk b/coreconf/config.mk
index 39f755d01..b65e6846c 100644
--- a/coreconf/config.mk
+++ b/coreconf/config.mk
@@ -149,8 +149,10 @@ DEFINES += -DNSS_DISABLE_DBM
endif
ifdef NSS_DISABLE_AVX2
+ifneq ($(NSS_DISABLE_AVX2),0)
DEFINES += -DNSS_DISABLE_AVX2
endif
+endif
ifdef NSS_DISABLE_CHACHAPOLY
DEFINES += -DNSS_DISABLE_CHACHAPOLY