diff options
| author | zhijufan <zhijux.fan@intel.com> | 2018-12-14 09:47:12 +0800 |
|---|---|---|
| committer | BobCF <bob.c.feng@intel.com> | 2018-12-18 14:07:40 +0800 |
| commit | 7c3a1efd15243df7783c4a5a6be412e99402f5a0 (patch) | |
| tree | dc77048a69774b3b48bc2d411221dbde9877d407 /BaseTools/Conf | |
| parent | b4c012d87393717e88bec464bf9d987442005838 (diff) | |
| download | edk2-7c3a1efd15243df7783c4a5a6be412e99402f5a0.tar.gz edk2-7c3a1efd15243df7783c4a5a6be412e99402f5a0.tar.bz2 edk2-7c3a1efd15243df7783c4a5a6be412e99402f5a0.zip | |
BaseTools: Update nasm file build rule to support $(INC)
https://bugzilla.tianocore.org/show_bug.cgi?id=1085
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>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
Diffstat (limited to 'BaseTools/Conf')
| -rwxr-xr-x | BaseTools/Conf/build_rule.template | 3 |
1 files changed, 2 insertions, 1 deletions
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>
|