Merge pull request #60593 from apple/egorzhdan/glibc-uuid-path

egorzhdan · web-flow · commit 29caf1dd6485 · 2022-08-17T20:55:08.000+01:00
[Glibc] Refer to UUID headers from the modulemap using relative paths
diff --git 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 *
 }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ module SwiftGlibc [system] {`
`51`	`51`
`52`	`52`	`% if CMAKE_SDK != "WASI" and CMAKE_SDK != "ANDROID":`
`53`	`53`	`module CUUID [system] {`
`54`		`- header "${GLIBC_INCLUDE_PATH}/uuid/uuid.h"`
	`54`	`+ header "uuid/uuid.h"`
`55`	`55`	`link "uuid"`
`56`	`56`	`export *`
`57`	`57`	`}`