diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2014-09-01 17:22:51 +0000 |
|---|---|---|
| committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-09-01 17:22:51 +0000 |
| commit | ff0279814ae3ed14914c0fa2eefe89d33a4bd6c3 (patch) | |
| tree | 5104bea464db417db0f3a7ffe6a1581585596fd4 /BaseTools | |
| parent | 9a5a74358278c241f07f27b3c6f9cb3d33d6c936 (diff) | |
| download | edk2-platforms-ff0279814ae3ed14914c0fa2eefe89d33a4bd6c3.tar.xz | |
BaseTools build_rule: Add .nasm => .obj build rule
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16017 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'BaseTools')
| -rw-r--r-- | BaseTools/Conf/build_rule.template | 15 | ||||
| -rw-r--r-- | BaseTools/Conf/tools_def.template | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template index de142de4bb..496fd666b1 100644 --- a/BaseTools/Conf/build_rule.template +++ b/BaseTools/Conf/build_rule.template @@ -170,6 +170,21 @@ # For RVCTCYGWIN ASM_FLAGS must be first to work around pathing issues
"$(ASM)" $(ASM_FLAGS) -o ${dst} $(INC) ${d_path}(+)${s_base}.iii
+[Nasm-Assembly-Code-File.COMMON.COMMON]
+ <InputFile>
+ ?.nasm, ?.Nasm, ?.NASM
+
+ <ExtraDependency>
+ $(MAKE_FILE)
+
+ <OutputFile>
+ $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.obj
+
+ <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
+
[Assembly-Code-File.COMMON.IPF]
<InputFile>
?.s
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 824bc056b8..15993ddf01 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -671,8 +671,6 @@ DEFINE SOURCERY_CYGWIN_TOOLS = /cygdrive/c/Program Files/CodeSourcery/Sourcery G # Other Supported Tools
# =====================
# NASM 2.0.3 http://www.nasm.us/
-# Note: Converts NASM source to .bin. Object linking to
-# EDK II driver modules is not currently supported.
#
####################################################################################
####################################################################################
|