Merge commit 'b5f003d7a3ece37db45578a8a3140b370036fc64' into vulkan-cts
diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt
index a0259a3..b77dee7 100644
--- a/glslang/CMakeLists.txt
+++ b/glslang/CMakeLists.txt
@@ -1,6 +1,6 @@
if(WIN32)
add_subdirectory(OSDependent/Windows)
-elseif(UNIX)
+elseif(UNIX OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
add_subdirectory(OSDependent/Unix)
else(WIN32)
message("unknown platform")
diff --git a/glslang/OSDependent/Unix/ossource.cpp b/glslang/OSDependent/Unix/ossource.cpp
index 3f029f0..48ff4f2 100644
--- a/glslang/OSDependent/Unix/ossource.cpp
+++ b/glslang/OSDependent/Unix/ossource.cpp
@@ -73,6 +73,7 @@
//
void OS_CleanupThreadData(void)
{
+ // Fuchsia does not have a meaningful pthread_cancel.
#if defined(__ANDROID__) || defined(__Fuchsia__)
DetachThreadLinux(NULL);
#else
