[PATCH v2 1/1] BaseTools: Add quotes around OBJCOPY cmd in build_rule.template

[PATCH v2 1/1] BaseTools: Add quotes around OBJCOPY cmd in build_rule.template

[Rebecca Cran]

Add quotes around the OBJCOPY command in build_rule.template to fix the
case where LLVM is installed on Windows in a path with spaces such as
C:\Program Files\LLVM.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 BaseTools/Conf/build_rule.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index d42e7937cc90..eb64c62060e1 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -352,12 +352,12 @@
         -$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR) 
     <Command.GCC>
         $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
-        $(OBJCOPY) $(OBJCOPY_STRIPFLAG) ${src}
+        "$(OBJCOPY)" $(OBJCOPY_STRIPFLAG) ${src}
 
         #
         #The below 2 lines are only needed for UNIXGCC tool chain, which generates PE image directly
         #
-        -$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src}
+        -"$(OBJCOPY)" $(OBJCOPY_ADDDEBUGFLAG) ${src}
         -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug
 
         "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)
-- 
2.40.0.windows.1

回复: [edk2-devel] [PATCH v2 1/1] BaseTools: Add quotes around OBJCOPY cmd in build_rule.template

[gaoliming]

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

This change can be merged first. 

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Rebecca Cran
> 发送时间: 2023年4月24日 22:06
> 收件人: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>;
> Bob Feng <bob.c.feng@intel.com>; Yuwei Chen <yuwei.chen@intel.com>
> 抄送: Rebecca Cran <rebecca@bsdio.com>
> 主题: [edk2-devel] [PATCH v2 1/1] BaseTools: Add quotes around OBJCOPY
> cmd in build_rule.template
> 
> Add quotes around the OBJCOPY command in build_rule.template to fix the
> case where LLVM is installed on Windows in a path with spaces such as
> C:\Program Files\LLVM.
> 
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  BaseTools/Conf/build_rule.template | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/BaseTools/Conf/build_rule.template
> b/BaseTools/Conf/build_rule.template
> index d42e7937cc90..eb64c62060e1 100755
> --- a/BaseTools/Conf/build_rule.template
> +++ b/BaseTools/Conf/build_rule.template
> @@ -352,12 +352,12 @@
>          -$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR)
>      <Command.GCC>
>          $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
> -        $(OBJCOPY) $(OBJCOPY_STRIPFLAG) ${src}
> +        "$(OBJCOPY)" $(OBJCOPY_STRIPFLAG) ${src}
> 
>          #
>          #The below 2 lines are only needed for UNIXGCC tool chain, which
> generates PE image directly
>          #
> -        -$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src}
> +        -"$(OBJCOPY)" $(OBJCOPY_ADDDEBUGFLAG) ${src}
>          -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug
> $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug
> 
>          "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src}
> $(GENFW_FLAGS)
> --
> 2.40.0.windows.1
> 
> 
> 
> 
> 

Re: [PATCH v2 1/1] BaseTools: Add quotes around OBJCOPY cmd in build_rule.template

[Bob Feng]

Reviewed-by: Bob Feng <bob.c.feng@intel.com>

-----Original Message-----
From: Rebecca Cran <rebecca@bsdio.com> 
Sent: Monday, April 24, 2023 10:06 PM
To: devel@edk2.groups.io; Gao, Liming <gaoliming@byosoft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com>
Cc: Rebecca Cran <rebecca@bsdio.com>
Subject: [PATCH v2 1/1] BaseTools: Add quotes around OBJCOPY cmd in build_rule.template

Add quotes around the OBJCOPY command in build_rule.template to fix the case where LLVM is installed on Windows in a path with spaces such as C:\Program Files\LLVM.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 BaseTools/Conf/build_rule.template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Conf/build_rule.template b/BaseTools/Conf/build_rule.template
index d42e7937cc90..eb64c62060e1 100755
--- a/BaseTools/Conf/build_rule.template
+++ b/BaseTools/Conf/build_rule.template
@@ -352,12 +352,12 @@
         -$(CP) $(DEBUG_DIR)(+)*.pdb $(OUTPUT_DIR) 
     <Command.GCC>
         $(CP) ${src} $(DEBUG_DIR)(+)$(MODULE_NAME).debug
-        $(OBJCOPY) $(OBJCOPY_STRIPFLAG) ${src}
+        "$(OBJCOPY)" $(OBJCOPY_STRIPFLAG) ${src}
 
         #
         #The below 2 lines are only needed for UNIXGCC tool chain, which generates PE image directly
         #
-        -$(OBJCOPY) $(OBJCOPY_ADDDEBUGFLAG) ${src}
+        -"$(OBJCOPY)" $(OBJCOPY_ADDDEBUGFLAG) ${src}
         -$(CP) $(DEBUG_DIR)(+)$(MODULE_NAME).debug $(BIN_DIR)(+)$(MODULE_NAME_GUID).debug
 
         "$(GENFW)" -e $(MODULE_TYPE) -o ${dst} ${src} $(GENFW_FLAGS)
--
2.40.0.windows.1