Skip to content

[Glibc] Remove Android gyb logic from the modulemap #76853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 3, 2024
Merged

[Glibc] Remove Android gyb logic from the modulemap #76853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions stdlib/public/Platform/glibc.modulemap.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
/// It's not named just Glibc so that it doesn't conflict in the event of a
/// future official glibc modulemap.
module SwiftGlibc [system] {
% if CMAKE_SDK in ["LINUX", "ANDROID", "OPENBSD"]:
% if CMAKE_SDK in ["LINUX", "OPENBSD"]:
link "m"
% end
% if CMAKE_SDK in ["LINUX", "FREEBSD", "OPENBSD", "CYGWIN"]:
Expand Down Expand Up @@ -49,7 +49,7 @@ module SwiftGlibc [system] {
export *
}

% if CMAKE_SDK != "WASI" and CMAKE_SDK != "ANDROID":
% if CMAKE_SDK != "WASI":
module CUUID [system] {
header "uuid/uuid.h"
link "uuid"
Expand Down