Skip to content

Commit 77f058c

Browse files
committed
Everywhere: Remove iOS support
Now that ladybird was hard-forked from SerenityOS, there's no good reason to keep supporting iOS. Ladybird only still exists in the SerenityOS repo to make testing LibWeb easier.
1 parent 64aa356 commit 77f058c

File tree

18 files changed

+34
-49
lines changed

18 files changed

+34
-49
lines changed

AK/Platform.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,11 @@
7676
# define AK_OS_LINUX
7777
#endif
7878

79-
#if defined(__APPLE__) && defined(__MACH__) && !defined(__IOS__)
79+
#if defined(__APPLE__) && defined(__MACH__)
8080
# define AK_OS_MACOS
8181
# define AK_OS_BSD_GENERIC
8282
#endif
8383

84-
#if defined(__IOS__)
85-
# define AK_OS_IOS
86-
# define AK_OS_BSD_GENERIC
87-
#endif
88-
8984
#if defined(__FreeBSD__)
9085
# define AK_OS_BSD_GENERIC
9186
# define AK_OS_FREEBSD

AK/StackInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#ifdef AK_OS_SERENITY
1414
# include <serenity.h>
15-
#elif defined(AK_OS_LINUX) || defined(AK_LIBC_GLIBC) || defined(AK_OS_MACOS) || defined(AK_OS_IOS) || defined(AK_OS_NETBSD) || defined(AK_OS_SOLARIS) || defined(AK_OS_HAIKU)
15+
#elif defined(AK_OS_LINUX) || defined(AK_LIBC_GLIBC) || defined(AK_OS_MACOS) || defined(AK_OS_NETBSD) || defined(AK_OS_SOLARIS) || defined(AK_OS_HAIKU)
1616
# include <pthread.h>
1717
# include <sys/resource.h>
1818
#elif defined(AK_OS_FREEBSD) || defined(AK_OS_OPENBSD)
@@ -55,7 +55,7 @@ StackInfo::StackInfo()
5555
VERIFY_NOT_REACHED();
5656
}
5757
pthread_attr_destroy(&attr);
58-
#elif defined(AK_OS_MACOS) || defined(AK_OS_IOS)
58+
#elif defined(AK_OS_MACOS)
5959
// NOTE: !! On MacOS, pthread_get_stackaddr_np gives the TOP of the stack, not the bottom!
6060
FlatPtr top_of_stack = (FlatPtr)pthread_get_stackaddr_np(pthread_self());
6161
m_size = (size_t)pthread_get_stacksize_np(pthread_self());

Ladybird/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ project(ladybird
88

99
include(GNUInstallDirs)
1010

11-
if (IOS)
12-
set(BUILD_SHARED_LIBS OFF)
13-
endif()
14-
1511
# FIXME: The rpath steps from lagom_install_rules.cmake do not produce a working binary
1612
# in the build directory on macOS.
1713
# We need to copy the libs into the build directory bundle as the install rules do.

Meta/CMake/accelerated_graphics.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if (NOT ENABLE_ACCELERATED_GRAPHICS OR EMSCRIPTEN)
44
return()
55
endif()
66

7-
if (APPLE AND NOT IOS)
7+
if (APPLE)
88
set(HAS_ACCELERATED_GRAPHICS ON CACHE BOOL "" FORCE)
99
set(ACCEL_GFX_LIBS "-framework OpenGL" CACHE STRING "" FORCE)
1010
else()

Meta/Lagom/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ if (BUILD_LAGOM)
564564

565565
add_serenity_subdirectory(Userland/Shell)
566566

567-
if (NOT ENABLE_FUZZERS AND NOT ENABLE_COMPILER_EXPLORER_BUILD AND NOT IOS)
567+
if (NOT ENABLE_FUZZERS AND NOT ENABLE_COMPILER_EXPLORER_BUILD)
568568
# Lagom Services
569569
add_serenity_subdirectory(Userland/Services)
570570

Meta/gn/build/toolchain/BUILD.gn

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ template("unix_toolchain") {
6565
}
6666

6767
tool("alink") {
68-
if (current_os == "ios" || current_os == "mac") {
68+
if (current_os == "mac") {
6969
command = "libtool -D -static -no_warning_for_no_symbols {{arflags}} -o {{output}} {{inputs}}"
7070
not_needed([ "ar" ])
7171
} else {
@@ -93,7 +93,7 @@ template("unix_toolchain") {
9393
outfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}"
9494
rspfile = outfile + ".rsp"
9595
rspfile_content = "{{inputs}}"
96-
if (current_os == "ios" || current_os == "mac") {
96+
if (current_os == "mac") {
9797
command = "$ld -shared {{ldflags}} -o $outfile @\"$rspfile\" {{libs}} {{frameworks}} -Wl,-install_name,@rpath/{{target_output_name}}{{output_extension}}"
9898
default_output_extension = ".dylib"
9999
} else {
@@ -113,7 +113,7 @@ template("unix_toolchain") {
113113

114114
tool("solink_module") {
115115
outfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}"
116-
if (current_os == "ios" || current_os == "mac") {
116+
if (current_os == "mac") {
117117
command = "$ld -shared {{ldflags}} -Wl,-flat_namespace -Wl,-undefined,suppress -o $outfile {{inputs}} {{libs}} {{frameworks}} -Wl,-install_name,@rpath/{{target_output_name}}{{output_extension}}"
118118
default_output_extension = ".dylib"
119119
} else {
@@ -135,7 +135,7 @@ template("unix_toolchain") {
135135
command_launcher = "ccache"
136136
}
137137
outfile = "{{output_dir}}/{{target_output_name}}{{output_extension}}"
138-
if (current_os == "ios" || current_os == "mac") {
138+
if (current_os == "mac") {
139139
command = "$ld {{ldflags}} -o $outfile {{inputs}} {{libs}} {{frameworks}} -Wl,-rpath,@executable_path/../lib"
140140
} else {
141141
command = "$ld {{ldflags}} -o $outfile -Wl,--start-group {{inputs}} -Wl,--end-group -Wl,-rpath,\\\$ORIGIN/../lib {{libs}}"
@@ -157,7 +157,7 @@ template("unix_toolchain") {
157157
description = "COPY {{source}} {{output}}"
158158
}
159159

160-
if (current_os == "ios" || current_os == "mac") {
160+
if (current_os == "mac") {
161161
tool("copy_bundle_data") {
162162
# https://github.com/nico/hack/blob/master/notes/copydir.md
163163
_copydir = "cd {{source}} && " +

Userland/Libraries/LibAudio/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ if (HAVE_PULSEAUDIO)
4242
target_compile_definitions(LibAudio PRIVATE HAVE_PULSEAUDIO=1)
4343
endif()
4444

45-
if (APPLE AND NOT IOS)
45+
if (APPLE)
4646
target_sources(LibAudio PRIVATE PlaybackStreamAudioUnit.cpp)
4747

4848
find_library(AUDIO_UNIT AudioUnit REQUIRED)

Userland/Libraries/LibCompress/BrotliDictionary.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
// Include the 119.9 KiB of dictionary data from a binary file
1111
extern u8 const brotli_dictionary_data[];
12-
#if defined(AK_OS_MACOS) || defined(AK_OS_IOS)
12+
#if defined(AK_OS_MACOS)
1313
asm(".const_data\n"
1414
".globl _brotli_dictionary_data\n"
1515
"_brotli_dictionary_data:\n");

Userland/Libraries/LibCore/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ elseif (LINUX AND NOT EMSCRIPTEN)
8888
FileWatcherLinux.cpp
8989
Platform/ProcessStatisticsLinux.cpp
9090
)
91-
elseif (APPLE AND NOT IOS)
91+
elseif (APPLE)
9292
list(APPEND SOURCES
9393
FileWatcherMacOS.mm
9494
Platform/ProcessStatisticsMach.cpp

Userland/Libraries/LibCore/Environment.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "Environment.h"
1111
#include <AK/ByteString.h>
1212

13-
#if defined(AK_OS_MACOS) || defined(AK_OS_IOS)
13+
#if defined(AK_OS_MACOS)
1414
# include <crt_externs.h>
1515
#else
1616
extern "C" char** environ;
@@ -20,7 +20,7 @@ namespace Core::Environment {
2020

2121
char** raw_environ()
2222
{
23-
#if defined(AK_OS_MACOS) || defined(AK_OS_IOS)
23+
#if defined(AK_OS_MACOS)
2424
return *_NSGetEnviron();
2525
#else
2626
return environ;

0 commit comments

Comments
 (0)