Skip to content

Commit b921f49

Browse files
committed
libdispatch: updated patch for upstream changes
1 parent 0ca06fd commit b921f49

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

patches/libdispatch-own-blocksruntime.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index 711f64a..0ecb044 100644
2+
index 45461eb..7c954fb 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
55
@@ -178,6 +178,8 @@ if(NOT ANDROID)
@@ -11,7 +11,7 @@ index 711f64a..0ecb044 100644
1111
check_function_exists(_pthread_workqueue_init HAVE__PTHREAD_WORKQUEUE_INIT)
1212
check_function_exists(getprogname HAVE_GETPROGNAME)
1313
check_function_exists(mach_absolute_time HAVE_MACH_ABSOLUTE_TIME)
14-
@@ -330,7 +332,7 @@ add_subdirectory(dispatch)
14+
@@ -331,7 +333,7 @@ add_subdirectory(dispatch)
1515
add_subdirectory(man)
1616
add_subdirectory(os)
1717
add_subdirectory(private)
@@ -21,7 +21,7 @@ index 711f64a..0ecb044 100644
2121
endif()
2222
add_subdirectory(src)
2323
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
24-
index 0ec6038..0faf979 100644
24+
index ed5d2f4..257b02d 100644
2525
--- a/tests/CMakeLists.txt
2626
+++ b/tests/CMakeLists.txt
2727
@@ -80,9 +80,6 @@ function(add_unit_test name)
@@ -31,6 +31,6 @@ index 0ec6038..0faf979 100644
3131
- target_include_directories(${name}
3232
- SYSTEM BEFORE PRIVATE
3333
- "${BlocksRuntime_INCLUDE_DIR}")
34-
if("${CMAKE_C_SIMULATE_ID}" STREQUAL "MSVC")
34+
if("${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC")
3535
target_compile_options(${name} PRIVATE -Xclang -fblocks)
3636
target_compile_options(${name} PRIVATE /W3 -Wno-deprecated-declarations)

0 commit comments

Comments
 (0)