From 8032682c232d88a36cf1dffeba3dd2acbaa28085 Mon Sep 17 00:00:00 2001
From: David Karoly <karolyd577@gmail.com>
Date: Thu, 2 Dec 2021 17:36:57 +0100
Subject: [PATCH] OverriddenJamRules: sort out build flags for .S files

Change-Id: I1ad67e1aab3911e7b66dc801923e8ba5cc1e087d
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4755
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
---
 build/jam/OverriddenJamRules | 65 +++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 31 deletions(-)

diff --git a/build/jam/OverriddenJamRules b/build/jam/OverriddenJamRules
index 0f7e72ecc4..4904bd0191 100644
--- a/build/jam/OverriddenJamRules
+++ b/build/jam/OverriddenJamRules
@@ -173,38 +173,41 @@ rule Object
 
 rule As
 {
-	local flags ;
-	local includesSeparator ;
-	local localIncludesOption ;
-	local systemIncludesOption ;
-	if [ on $(1) return $(PLATFORM) ] = host {
-		flags = [ on $(1) return $(HOST_ASFLAGS) $(ASFLAGS) ] ;
-
-		CC on $(1) = $(HOST_CC) ;
-
-		includesSeparator = $(HOST_INCLUDES_SEPARATOR) ;
-		localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
-		systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
-	} else {
-		flags = [ on $(1) return $(TARGET_ASFLAGS_$(TARGET_PACKAGING_ARCH))
-			$(ASFLAGS) ] ;
-
-		CC on $(1) = $(TARGET_CC_$(TARGET_PACKAGING_ARCH)) ;
-
-		includesSeparator
-			= $(TARGET_INCLUDES_SEPARATOR_$(TARGET_PACKAGING_ARCH)) ;
-		localIncludesOption
-			= $(TARGET_LOCAL_INCLUDES_OPTION_$(TARGET_PACKAGING_ARCH)) ;
-		systemIncludesOption
-			= $(TARGET_SYSTEM_INCLUDES_OPTION_$(TARGET_PACKAGING_ARCH)) ;
-	}
-
 	Depends $(<) : $(>) [ on $(1) return $(PLATFORM) ] ;
-	ASFLAGS on $(<) += $(flags) $(SUBDIRASFLAGS) ;
-	ASHDRS on $(<) = [ on $(<) FIncludes $(HDRS) : $(localIncludesOption) ]
-		$(includesSeparator)
-		[ on $(<) FSysIncludes $(SYSHDRS) : $(systemIncludesOption) ] ;
-	ASDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+
+	on $(1) {
+		local flags ;
+		local includesSeparator ;
+		local localIncludesOption ;
+		local systemIncludesOption ;
+
+		if $(PLATFORM) = host {
+			flags = $(HOST_ASFLAGS) $(ASFLAGS) ;
+
+			CC on $(1) = $(HOST_CC) ;
+
+			includesSeparator = $(HOST_INCLUDES_SEPARATOR) ;
+			localIncludesOption = $(HOST_LOCAL_INCLUDES_OPTION) ;
+			systemIncludesOption = $(HOST_SYSTEM_INCLUDES_OPTION) ;
+		} else {
+			flags = $(TARGET_ASFLAGS_$(TARGET_PACKAGING_ARCH)) $(ASFLAGS) ;
+
+			CC on $(1) = $(TARGET_CC_$(TARGET_PACKAGING_ARCH)) ;
+
+			includesSeparator
+				= $(TARGET_INCLUDES_SEPARATOR_$(TARGET_PACKAGING_ARCH)) ;
+			localIncludesOption
+				= $(TARGET_LOCAL_INCLUDES_OPTION_$(TARGET_PACKAGING_ARCH)) ;
+			systemIncludesOption
+				= $(TARGET_SYSTEM_INCLUDES_OPTION_$(TARGET_PACKAGING_ARCH)) ;
+		}
+
+		ASFLAGS on $(<) += $(flags) $(SUBDIRASFLAGS) ;
+		ASHDRS on $(<) = [ on $(<) FIncludes $(HDRS) : $(localIncludesOption) ]
+			$(includesSeparator)
+			[ on $(<) FSysIncludes $(SYSHDRS) : $(systemIncludesOption) ] ;
+		ASDEFS on $(<) = [ on $(<) FDefines $(DEFINES) ] ;
+	}
 }
 
 actions As