-# No support for lto / gold on windows targets
-ifeq ($(OS), $(filter $(OS), Cygwin MingW))
- DIRS := $(filter-out lto gold, $(DIRS))
+# Only build edis if X86 target support is enabled.
+ifeq ($(filter $(TARGETS_TO_BUILD), X86),)
+ PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))
+endif
+
+# Don't build edis if we explicitly disabled it.
+ifeq ($(DISABLE_EDIS),1)
+ PARALLEL_DIRS := $(filter-out edis, $(PARALLEL_DIRS))