From 78c0540b6fca098983fe6802fa0382e286586106 Mon Sep 17 00:00:00 2001 From: Egor Zhdan Date: Wed, 17 Aug 2022 15:09:17 +0100 Subject: [PATCH] [Glibc] Refer to UUID headers from the modulemap using relative paths This improves portability of the Swift toolchains by removing a usage of absolute path to Glibc. The Glibc modulemap is now injected into the Glibc include path using LLVM VFS, so it can reference Glibc headers using relative paths. This already works for other Glibc headers (e.g. `assert.h`) --- stdlib/public/Platform/glibc.modulemap.gyb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/public/Platform/glibc.modulemap.gyb b/stdlib/public/Platform/glibc.modulemap.gyb index e745aac1dbc88..82597f579736c 100644 --- a/stdlib/public/Platform/glibc.modulemap.gyb +++ b/stdlib/public/Platform/glibc.modulemap.gyb @@ -51,7 +51,7 @@ module SwiftGlibc [system] { % if CMAKE_SDK != "WASI" and CMAKE_SDK != "ANDROID": module CUUID [system] { - header "${GLIBC_INCLUDE_PATH}/uuid/uuid.h" + header "uuid/uuid.h" link "uuid" export * }