all messages for Guix-related lists mirrored at yhetil.org

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
 From a3ac6df0441b4caca28b1df87febc420e18942ce Mon Sep 17 00:00:00 2001
From: Zephyr Lykos <git@mochaa.ws>
Date: Mon, 23 Oct 2023 15:55:24 +0800
Subject: [PATCH] Revert "Force usage of GSL fork because of a libstdc++ bug."

This reverts commit 982546b169df3d479e6511425870327559b38a89.
<https://github.com/microsoft/GSL/commit/e64c97fc2cfc11992098bb38eda932de275e3f4d>
---
 external/gsl/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/external/gsl/CMakeLists.txt b/external/gsl/CMakeLists.txt
index 8eaf19c5..344f9488 100644
--- a/external/gsl/CMakeLists.txt
+++ b/external/gsl/CMakeLists.txt
@@ -7,7 +7,6 @@
 add_library(external_gsl INTERFACE IMPORTED GLOBAL)
 add_library(desktop-app::external_gsl ALIAS external_gsl)
 
-#[[
 if (DESKTOP_APP_USE_PACKAGED)
     if (DESKTOP_APP_USE_PACKAGED_LAZY)
         find_package(Microsoft.GSL 4.0.0 QUIET)
@@ -20,7 +19,6 @@ if (DESKTOP_APP_USE_PACKAGED)
         return()
     endif()
 endif()
-]]
 
 # https://gitlab.kitware.com/cmake/cmake/-/issues/25222
 if (NOT EXISTS ${third_party_loc}/GSL/include)