]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools: Update nasm file build rule to support $(INC)
authorzhijufan <zhijux.fan@intel.com>
Fri, 14 Dec 2018 01:47:12 +0000 (09:47 +0800)
committerBobCF <bob.c.feng@intel.com>
Tue, 18 Dec 2018 06:07:40 +0000 (14:07 +0800)
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>
BaseTools/Conf/build_rule.template

index 3ab560603f42263fbaaf8b1dd765d4161df9086a..2a53d7ed63f9cfed4df812b917179fe8f32ca7f7 100755 (executable)
@@ -62,6 +62,7 @@
 #   $(BIN_DIR)          Common directory for executable files\r
 #   $(FV_DIR)           Directory to store flash image files\r
 #   $(INC)              Search path of current module\r
+#   $(NASM_INC)         Search nasm file path of current module\r
 #   $(INC_LIST)         A file containing search pathes of current module\r
 #   $(LIBS)             Static library files of current module\r
 #   $(<tool>_FLAGS)     Tools flags of current module\r
     <Command>\r
         "$(PP)" $(PP_FLAGS) $(INC) ${src} > ${d_path}(+)${s_base}.i\r
         Trim --trim-long --source-code -o ${d_path}(+)${s_base}.iii ${d_path}(+)${s_base}.i\r
-        "$(NASM)" -I${s_path}(+) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii\r
+        "$(NASM)" -I${s_path}(+) $(NASM_INC) $(NASM_FLAGS) -o $dst ${d_path}(+)${s_base}.iii\r
 \r
 [Device-Tree-Source-File]\r
     <InputFile>\r