From: Chris Ruffin <chris.ruffin@intel.com>
Date: Wed, 2 Aug 2017 20:30:06 +0000 (+0800)
Subject: BaseTools/Conf: apply nasmb, asm16 build rule order
X-Git-Tag: edk2-stable201903~3689
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8853c2afc51c2cab862acbef308f2588264e188b;p=mirror_edk2.git

BaseTools/Conf: apply nasmb, asm16 build rule order

Prioritize nasmb rule over asm16 where both source types are specified.

Change-Id: I33ec348dab66b313ddb05cb15f2d8407a648c320
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chris Ruffin <chris.ruffin@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
---

diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index cdc9df44d9..1fa3ca3cea 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -7580,4 +7580,4 @@ RELEASE_RVCTCYGWIN_ARM_CC_FLAGS  = "$(CCPATH_FLAG)" $(ARCHCC_FLAGS) $(PLATFORM_F
 #################
 # Build rule order
 #################
-*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s
+*_*_*_*_BUILDRULEORDER = nasm asm Asm ASM S s nasmb asm16