diff --git a/make/ldgen.mk b/make/ldgen.mk
index bd03e2067..7c88563cf 100644
--- a/make/ldgen.mk
+++ b/make/ldgen.mk
@@ -44,6 +44,7 @@ $(2): $(1) $(LDGEN_FRAGMENT_FILES) $(SDKCONFIG) $(BUILD_DIR_BASE)/ldgen_librarie
 		--env           "COMPONENT_KCONFIGS_SOURCE_FILE=$(COMPONENT_KCONFIGS_SOURCE_FILE)" \
 		--env           "COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE=$(COMPONENT_KCONFIGS_PROJBUILD_SOURCE_FILE)" \
 		--env           "IDF_CMAKE=n" \
+		--env           "IDF_ENV_FPGA=n" \
 		--objdump		$(OBJDUMP)
 endef
 endif # Windows_NT
diff --git a/tools/ci/check_build_warnings.py b/tools/ci/check_build_warnings.py
index 35e3794e7..e64cc4066 100755
--- a/tools/ci/check_build_warnings.py
+++ b/tools/ci/check_build_warnings.py
@@ -18,7 +18,7 @@ except ImportError:
     sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
     from find_build_apps import BuildItem, setup_logging
 
-WARNING_REGEX = re.compile(r"(?:error|warning)", re.MULTILINE | re.IGNORECASE)
+WARNING_REGEX = re.compile(r"(?:error|warning)[^\w]", re.MULTILINE | re.IGNORECASE)
 
 IGNORE_WARNS = [
     re.compile(r_str) for r_str in [