From 1ea3818ff5f06a3db8627d29e5126397195235ee Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 6 Sep 2021 16:45:13 -0400
Subject: [PATCH] LocaleRules: Ignore errors in ExtractCatalogEntries.

It seems GCC has the same behavior as Clang now, so we can ignore
errors generated while preprocessing. (Previously we did anyway,
before the recent commit adding -e to JAMSHELL flags, so this
just continues previous behavior.)
---
 build/jam/LocaleRules | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/build/jam/LocaleRules b/build/jam/LocaleRules
index 6cc36d36ce..eb210d9b77 100644
--- a/build/jam/LocaleRules
+++ b/build/jam/LocaleRules
@@ -66,25 +66,10 @@ rule ExtractCatalogEntries target : sources : signature : regexp
 	local subdir = [ on $(signature) return $(HAIKU_CATALOGS_SUBDIR) ] ;
 	MakeLocate $(target) : [ FDirName $(HAIKU_CATALOGS_OBJECT_DIR) $(subdir) ] ;
 	Depends $(target) : $(sources) <build>collectcatkeys ;
-	if $(HAIKU_CC_IS_CLANG_$(TARGET_PACKAGING_ARCH)) = 1 {
-		# Clang emits preprocessed source even if some included headers were not
-		# found, so we can treat a return code of 1 from it as not an error.
-		ExtractCatalogEntries2 $(target) : <build>collectcatkeys $(sources) ;
-	} else {
-		ExtractCatalogEntries1 $(target) : <build>collectcatkeys $(sources) ;
-	}
+	ExtractCatalogEntries1 $(target) : <build>collectcatkeys $(sources) ;
 }
 
 actions ExtractCatalogEntries1
-{
-	export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
-	$(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) "$(2[2-])" > "$(1)".pre
-	$(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \
-		-w -o "$(1)" "$(1)".pre
-	$(RM) "$(1)".pre
-}
-
-actions ExtractCatalogEntries2
 {
 	export $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
 	$(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) "$(2[2-])" > "$(1)".pre \