SWDEV-309909 - gitbash windows detection (#2415)
Change-Id: I5cca12c25b9a1b4a8b7b077f586715c4a4feb5e9
Этот коммит содержится в:
@@ -201,7 +201,7 @@ if (!$printed or $p_full) {
|
||||
print "=== Environment Variables\n";
|
||||
if ($isWindows) {
|
||||
print ("PATH=$ENV{PATH}\n");
|
||||
system("set | findstr /B /C:\"HIP\" /C:\"HSA\" /C:\"CUDA\" /C:\"LD_LIBRARY_PATH\"");
|
||||
system("set | findstr //B //C:\"HIP\" //C:\"HSA\" //C:\"CUDA\" //C:\"LD_LIBRARY_PATH\"");
|
||||
} else {
|
||||
system("echo PATH=\$PATH");
|
||||
system("env | egrep '^HIP|^HSA|^CUDA|^LD_LIBRARY_PATH'");
|
||||
@@ -212,7 +212,7 @@ if (!$printed or $p_full) {
|
||||
if ($isWindows) {
|
||||
print "== Windows Display Drivers\n";
|
||||
print "Hostname : "; system ("hostname");
|
||||
system ("wmic path win32_VideoController get AdapterCompatibility,InstalledDisplayDrivers,Name | findstr /B /C:\"Advanced Micro Devices\"");
|
||||
system ("wmic path win32_VideoController get AdapterCompatibility,InstalledDisplayDrivers,Name | findstr //B //C:\"Advanced Micro Devices\"");
|
||||
} else {
|
||||
print "== Linux Kernel\n";
|
||||
print "Hostname : "; system ("hostname");
|
||||
|
||||
@@ -60,7 +60,7 @@ sub can_run {
|
||||
}
|
||||
}
|
||||
|
||||
$isWindows = $^O eq 'MSWin32';
|
||||
$isWindows = ($^O eq 'MSWin32' or $^O eq 'msys');
|
||||
|
||||
#
|
||||
# TODO: Fix rpath LDFLAGS settings
|
||||
|
||||
Ссылка в новой задаче
Block a user