From 0feb2904db0923c4f9ecee593248dd876344845e Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Mon, 30 Mar 2009 15:11:55 +0000
Subject: [PATCH] Moved AssembleNasm to MainBuildRules.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29805 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 build/jam/MainBuildRules     | 10 ++++++++++
 build/jam/OverriddenJamRules | 10 ----------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index d6d95b0717..3f61d128a4 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -167,6 +167,16 @@ rule StaticLibraryFromObjects
 	LibraryFromObjects $(1) : $(2) ;
 }
 
+rule AssembleNasm
+{
+	Depends $(<) : $(>) ;
+}
+
+actions AssembleNasm
+{
+	nasm -d $(ASFLAGS) -f elf -o $(1) $(2)
+}
+
 rule Ld
 {
 	# Ld <name> : <objs> : <linkerscript> : <flags> ;
diff --git a/build/jam/OverriddenJamRules b/build/jam/OverriddenJamRules
index 2552d3d7fc..146cb9e527 100644
--- a/build/jam/OverriddenJamRules
+++ b/build/jam/OverriddenJamRules
@@ -170,16 +170,6 @@ rule Object
 	}
 }
 
-rule AssembleNasm
-{
-	Depends $(<) : $(>) ;
-}
-
-actions AssembleNasm
-{
-	nasm -d $(ASFLAGS) -f elf -o $(1) $(2) 
-}
-
 rule As
 {
 	local flags ;