aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorVaxry <[email protected]>2024-03-22 18:34:12 +0000
committerVaxry <[email protected]>2024-03-22 18:45:28 +0000
commit461757e2fb39e166db83858d877fcbd730ece4aa (patch)
treef3f482159ea270de67aceb2d22026c51aa650e71
parent397e08c16a7b7e414e8ef466e22fe5d4a581bafc (diff)
downloadHyprland-461757e2fb39e166db83858d877fcbd730ece4aa.tar.gz
Hyprland-461757e2fb39e166db83858d877fcbd730ece4aa.zip
scripts: fix asan patch
-rwxr-xr-xCMakeLists.txt1
-rw-r--r--scripts/hyprlandStaticAsan.diff8
2 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71766a8c..e039ceba 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,6 +121,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES DEBUG)
message(STATUS "Enabling ASan")
target_link_libraries(Hyprland asan)
+ target_link_libraries(Hyprland ${CMAKE_SOURCE_DIR}/libwayland-server.a)
target_compile_options(Hyprland PUBLIC -fsanitize=address)
endif()
diff --git a/scripts/hyprlandStaticAsan.diff b/scripts/hyprlandStaticAsan.diff
index 5499f793..72a24914 100644
--- a/scripts/hyprlandStaticAsan.diff
+++ b/scripts/hyprlandStaticAsan.diff
@@ -1,13 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 857e21de..122d6a78 100755
+index 71766a8c..bd8cdc0e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -101,7 +101,7 @@ message(STATUS "Checking deps...")
find_package(Threads REQUIRED)
find_package(PkgConfig REQUIRED)
find_package(OpenGL REQUIRED)
--pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo libdrm xkbcommon libinput pango pangocairo pixman-1 hyprlang>=0.3.2) # we do not check for wlroots, as we provide it ourselves
-+pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-client wayland-cursor wayland-protocols cairo libdrm xkbcommon libinput pango pangocairo pixman-1 hyprlang>=0.3.2 libffi) # we do not check for wlroots, as we provide it ourselves
+-pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo libdrm xkbcommon libinput pango pangocairo pixman-1 hyprlang>=0.3.2 hyprcursor) # we do not check for wlroots, as we provide it ourselves
++pkg_check_modules(deps REQUIRED IMPORTED_TARGET wayland-server wayland-client wayland-cursor wayland-protocols cairo libdrm xkbcommon libinput pango pangocairo pixman-1 hyprlang>=0.3.2 hyprcursor libffi) # we do not check for wlroots, as we provide it ourselves
file(GLOB_RECURSE SRCFILES CONFIGURE_DEPENDS "src/*.cpp")
@@ -18,4 +18,4 @@ index 857e21de..122d6a78 100755
+ target_link_libraries(Hyprland ${CMAKE_SOURCE_DIR}/libwayland-server.a)
target_compile_options(Hyprland PUBLIC -fsanitize=address)
endif()
- \ No newline at end of file
+