From: Yonghong Zhu <yonghong.zhu@intel.com>
To: edk2-devel@lists.01.org
Cc: zhijufan <zhijux.fan@intel.com>,
Liming Gao <liming.gao@intel.com>,
Bob Feng <bob.c.feng@intel.com>
Subject: [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC)
Date: Fri, 14 Dec 2018 09:47:12 +0800 [thread overview]
Message-ID: <1544752032-4172-3-git-send-email-yonghong.zhu@intel.com> (raw)
In-Reply-To: <1544752032-4172-1-git-send-email-yonghong.zhu@intel.com>
From: zhijufan <zhijux.fan@intel.com>
Update the build rule to:
"$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS)
-o $dst ${d_path}(+)${s_base}.iii
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
---
BaseTools/Conf/build_rule.template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index 3ab560603f..2a53d7ed63 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -62,6 +62,7 @@
# $(BIN_DIR) Common directory for executable files
# $(FV_DIR) Directory to store flash image files
# $(INC) Search path of current module
+# $(NASM_INC) Search nasm file path of current module
# $(INC_LIST) A file containing search pathes of current module
# $(LIBS) Static library files of current module
# $(<tool>_FLAGS) Tools flags of current module
@@ -225,7 +226,7 @@
<Command>
"$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i
Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i
- "$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
+ "$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii
[Device-Tree-Source-File]
<InputFile>
--
2.18.0.windows.1
next prev parent reply other threads:[~2018-12-14 1:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-14 1:47 [Patch 0/2] Update .nasm to support $(INC)-like support Yonghong Zhu
2018-12-14 1:47 ` [PATCH] BaseTools: Add $(INC)-like support when compiling .nasm files Yonghong Zhu
2018-12-14 1:47 ` Yonghong Zhu [this message]
2018-12-18 6:02 ` [PATCH 2/2] BaseTools: Update nasm file build rule to support $(INC) Feng, Bob C
-- strict thread matches above, loose matches on Subject: below --
2018-10-25 7:37 [Patch 0/2] Update .nasm to support $(INC)-like support Yonghong Zhu
2018-10-25 7:37 ` [Patch 2/2] BaseTools: Update nasm file build rule to support $(INC) Yonghong Zhu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1544752032-4172-3-git-send-email-yonghong.zhu@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox