summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuhammad Hamza <muhammad_hamza@mentor.com>2022-10-24 11:02:30 +0500
committerJoshua Watt <JPEWhacker@gmail.com>2022-10-26 13:12:20 -0500
commitf908cab8edfcde40aac1eff06813f5128d1467aa (patch)
tree4736fcfebbc45e65e72e7cbd9a8af866530ac12a
parentb0067202db8573df3d23d199f82987cebe1bee2c (diff)
downloadmeta-mingw-f908cab8edfcde40aac1eff06813f5128d1467aa.tar.gz
toolchain-scripts-mingw32.bbclass: Remove trailing slash in SDKROOT
Modify toolchain-scripts-mingw32.bbclass to add a check in environment-setup script which removes trailing slash in path of SDKROOT. This is needed to avoid multiple adjacent slashes in paths which are produced by appending to SDKROOT. In reference to https://learn.microsoft.com/en-us/windows/win32/fileio/naming-a-file?redirectedfrom=MSDN naming convention used for paths and disk drives in windows should use a single backslash. Even though in some cases windows ignores double slashes in paths and it might work but it isn't documented as a right naming convention and does fail in some cases eg. dir command cannot interpret double slashes and fails. For example if my SDK is located in D: drive, the environment setup scripts sets "SDKROOT=D:\" and hence SDKTARGETSYSROOT gets set as "SDKTARGETSYSROOT=D:\\sysroots\armv8a-oe-linux" The introduced check removes additional slash in SDKROOT to set it as "SDKROOT=D:" so all other variables using SDKROOT get set without additional slash. Signed-off-by: Muhammad Hamza <muhammad_hamza@mentor.com> Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
-rw-r--r--classes/toolchain-scripts-mingw32.bbclass1
1 files changed, 1 insertions, 0 deletions
diff --git a/classes/toolchain-scripts-mingw32.bbclass b/classes/toolchain-scripts-mingw32.bbclass
index d96cb40..8cb426a 100644
--- a/classes/toolchain-scripts-mingw32.bbclass
+++ b/classes/toolchain-scripts-mingw32.bbclass
@@ -12,6 +12,7 @@ toolchain_create_sdk_env_script:sdkmingw32 () {
12 touch $script 12 touch $script
13 # Be sure to use the 'short' path, so we can have deeper directories. 13 # Be sure to use the 'short' path, so we can have deeper directories.
14 echo 'set SDKROOT=%~sdp0%' >> $script 14 echo 'set SDKROOT=%~sdp0%' >> $script
15 echo 'IF %SDKROOT:~-1%==\ set SDKROOT=%SDKROOT:~0,-1%' >> $script
15 16
16 # Convert to mingw32 subpaths 17 # Convert to mingw32 subpaths
17 sysroot='%SDKROOT%'${sysroot##${SDKPATH}} 18 sysroot='%SDKROOT%'${sysroot##${SDKPATH}}