diff --git a/tools/export/gcc_arm_common.tmpl b/tools/export/gcc_arm_common.tmpl
index 6b23dd5bca..415fdab4e4 100644
--- a/tools/export/gcc_arm_common.tmpl
+++ b/tools/export/gcc_arm_common.tmpl
@@ -13,7 +13,8 @@ endif
 ifeq (,$(filter .build,$(notdir $(CURDIR))))
 .SUFFIXES:
 OBJDIR := .build
-MAKETARGET = $(MAKE) --no-print-directory -C $(OBJDIR) -f $(CURDIR)/Makefile \
+mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
+MAKETARGET = $(MAKE) --no-print-directory -C $(OBJDIR) -f $(mkfile_path) \
 		SRCDIR=$(CURDIR) $(MAKECMDGOALS)
 .PHONY: $(OBJDIR) clean
 all:
diff --git a/tools/toolchains/__init__.py b/tools/toolchains/__init__.py
index 20f1460cb3..5595294506 100644
--- a/tools/toolchains/__init__.py
+++ b/tools/toolchains/__init__.py
@@ -147,7 +147,7 @@ class Resources:
             v = [rel_path(f, base, dot) for f in getattr(self, field)]
             setattr(self, field, v)
 
-        self.features = {k: f.relative_to(base, dot) for k, f in self.features.iteritems()}
+        self.features = {k: f.relative_to(base, dot) for k, f in self.features.iteritems() if f}
 
         if self.linker_script is not None:
             self.linker_script = rel_path(self.linker_script, base, dot)
@@ -160,7 +160,7 @@ class Resources:
             v = [f.replace('\\', '/') for f in getattr(self, field)]
             setattr(self, field, v)
 
-        self.features = {k: f.win_to_unix() for k, f in self.features.iteritems()}
+        self.features = {k: f.win_to_unix() for k, f in self.features.iteritems() if f}
 
         if self.linker_script is not None:
             self.linker_script = self.linker_script.replace('\\', '/')