public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [Patch] BaseTools: Fix the Windows GCC Build Failure with too long path
@ 2016-11-03 10:32 Yonghong Zhu
  2016-11-04  3:25 ` Gao, Liming
  0 siblings, 1 reply; 2+ messages in thread
From: Yonghong Zhu @ 2016-11-03 10:32 UTC (permalink / raw)
  To: edk2-devel; +Cc: Liming Gao

When path is too long, build tool will wrap them into resp.txt, then call
gcc @resp.txt. It will cause windows GCC build failure, because resp.txt
still uses windows directory separator \. This patch change the \ to /.

Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/AutoGen/GenMake.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index c8c5fc5..51c5238 100644
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -766,11 +766,15 @@ cleanlib:
                                 if (Value.find(MacroName) != -1):
                                     Value = Value.replace(MacroName, self._AutoGenObject.Macros[macro])
                                     break
                             else:
                                 break
-                        RespDict[Key] = Value
+
+                        if self._AutoGenObject.ToolChainFamily == 'GCC':
+                            RespDict[Key] = Value.replace('\\', '/')
+                        else:
+                            RespDict[Key] = Value
                         for Target in BuildTargets:
                             for i, SingleCommand in enumerate(BuildTargets[Target].Commands):
                                 if FlagDict[Flag]['Macro'] in SingleCommand:
                                     BuildTargets[Target].Commands[i] = SingleCommand.replace('$(INC)','').replace(FlagDict[Flag]['Macro'], RespMacro)
         return RespDict
-- 
2.6.1.windows.1



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [Patch] BaseTools: Fix the Windows GCC Build Failure with too long path
  2016-11-03 10:32 [Patch] BaseTools: Fix the Windows GCC Build Failure with too long path Yonghong Zhu
@ 2016-11-04  3:25 ` Gao, Liming
  0 siblings, 0 replies; 2+ messages in thread
From: Gao, Liming @ 2016-11-04  3:25 UTC (permalink / raw)
  To: Zhu, Yonghong, edk2-devel@lists.01.org

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Yonghong Zhu
> Sent: Thursday, November 03, 2016 6:32 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [Patch] BaseTools: Fix the Windows GCC Build Failure with
> too long path
> 
> When path is too long, build tool will wrap them into resp.txt, then call
> gcc @resp.txt. It will cause windows GCC build failure, because resp.txt
> still uses windows directory separator \. This patch change the \ to /.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
> ---
>  BaseTools/Source/Python/AutoGen/GenMake.py | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py
> b/BaseTools/Source/Python/AutoGen/GenMake.py
> index c8c5fc5..51c5238 100644
> --- a/BaseTools/Source/Python/AutoGen/GenMake.py
> +++ b/BaseTools/Source/Python/AutoGen/GenMake.py
> @@ -766,11 +766,15 @@ cleanlib:
>                                  if (Value.find(MacroName) != -1):
>                                      Value = Value.replace(MacroName,
> self._AutoGenObject.Macros[macro])
>                                      break
>                              else:
>                                  break
> -                        RespDict[Key] = Value
> +
> +                        if self._AutoGenObject.ToolChainFamily == 'GCC':
> +                            RespDict[Key] = Value.replace('\\', '/')
> +                        else:
> +                            RespDict[Key] = Value
>                          for Target in BuildTargets:
>                              for i, SingleCommand in
> enumerate(BuildTargets[Target].Commands):
>                                  if FlagDict[Flag]['Macro'] in SingleCommand:
>                                      BuildTargets[Target].Commands[i] =
> SingleCommand.replace('$(INC)','').replace(FlagDict[Flag]['Macro'],
> RespMacro)
>          return RespDict
> --
> 2.6.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-11-04  3:27 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-03 10:32 [Patch] BaseTools: Fix the Windows GCC Build Failure with too long path Yonghong Zhu
2016-11-04  3:25 ` Gao, Liming

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox