From 31433f615ea358688121b79b3449baabf988082c Mon Sep 17 00:00:00 2001
From: David McPaul <dlmcpaul@gmail.com>
Date: Sat, 11 Apr 2009 06:23:14 +0000
Subject: [PATCH] test for valid ASFLAGS before calling yasm

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30112 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/MainBuildRules | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 05453212d0..0486010394 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -174,7 +174,11 @@ rule AssembleNasm
 
 actions AssembleNasm
 {
-	yasm -d $(ASFLAGS) -f elf -o $(1) $(2)
+	if test $(ASFLAGS) ; then
+		yasm -d $(ASFLAGS) -f elf32 -o $(1) $(2);
+	else
+		yasm -f elf32 -o $(1) $(2);
+	fi
 }
 
 rule Ld