From 0871db30bd73d112a434f54572d34cca28de61c5 Mon Sep 17 00:00:00 2001 From: fis Date: Sat, 26 May 2018 22:58:37 +0800 Subject: [PATCH 2/2] * CMakeLists.txt: Fix flags for gcc. --- CMakeLists.txt | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eba147b..d60dcef 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,20 +6,6 @@ add_executable(unit src/fifo_map.hpp test/unit.cpp) target_include_directories(unit PRIVATE "test" "src") -if(MSVC) - set(CMAKE_CXX_FLAGS - "/EHsc" - ) +set(CMAKE_CXX_FLAGS "-std=c++11 -fpermissive") - STRING(REPLACE "/O2" "/Od" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}) - - add_definitions(-D_SCL_SECURE_NO_WARNINGS) -else(MSVC) - set(CMAKE_CXX_FLAGS - "-std=c++11 -stdlib=libc++" - ) -endif(MSVC) - -include_directories( - src test -) +include_directories(src test) -- 2.14.3 '>
aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/ots.scm
)
AgeCommit message (Expand)Author
Author
2024-08-31gnu: ghc: Fix build with binutils ≥ 2.39....ld warns about exec stack now, making some tests fail. Fix them (and also remove an unwarranted exec stack from libHSrts along with it). * gnu/packages/patches/ghc-9-StgCRunAsm-only-when-needed.patch * gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch: New patches. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/haskell.scm (ghc-8.6, ghc-8.8, ghc-8.10, ghc-9.0, ghc-9.2, ghc-9.4): Use them. Change-Id: I8e5fc71d7394527d44ff37b1f9bd59d4971ec010 Josselin Poiret
2024-08-31gnu: ghc-9.2: Remove unneeded glibc 2.33 patch....* gnu/packages/patches/ghc-9.2-glibc-2.33-link-order.patch: Remove. * gnu/local.mk (dist_patch_DATA): Unregister. * gnu/packages/haskell.scm (ghc-9.2): Remove patch use. Change-Id: I7d305dadb627f6af55e4a5faabfc835e4a78a05b Josselin Poiret
2024-06-29gnu: ghc-9.2: Update to 9.2.8....* gnu/packages/haskell.scm (ghc-9.2): Update to 9.2.8. Change-Id: I4cbb48ad166f893a5b7c707505a77effce208b86 Lars-Dominik Braun
2024-06-29gnu: ghc-9.2: Make Cabal respect GHC_PACKAGE_PATH...**tl;dr** Applying this patch makes Cabal work in Guix environments and ensures that Cabal picks up Haskell packages installed via Guix. Guix makes heavy use of GHC_PACKAGE_PATH to make GHC pickup Haskell packages installed via the Guix package manager. The environment variable is set using native-search-paths from the GHC packages. Unfortunately, upstream Cabal does presently not respect GHC_PACKAGE_PATH. If this environment variable is set, `cabal build` and other commands will terminate. For building packages, Guix does not make much use of cabal-install hence this is not as big of an issue. However, cabal-install does therefore presently not work out-of-the-box in environments created by Guix. For example, in `guix shell` environments. This makes it essentially impossible to use Guix for setting up development environments for Haskell software. Cabal upstream is aware of this issue and a patch exists to workaround this problem. The patch is currently not merged upstream due to issues related to reconfiguration (changing GHC_PACKAGE_PATH between `cabal configure` and `cabal build`). However, I would argue that this edge case is not that relevant for Guix and therefore propose including this patch with the Cabal Guix package. As outlined above, cabal-install is not usable by default presently, and I would therefore argue that this is a major improvement over the current situation. I am willing to work with Cabal upstream to have this issue fixed upstream eventually. Note that this requires patching the GHC package instead of the cabal-install package as Guix uses the version of the Cabal package <https://hackage.haskell.org/package/Cabal> distributed with GHC. See: https://github.com/haskell/cabal/issues/3728 * gnu/packages/haskell-apps.scm (cabal-install): Include patch to support the GHC_PACKAGE_PATH environment variable. Signed-off-by: Sören Tempel <soeren@soeren-tempel.net> Signed-off-by: Lars-Dominik Braun <lars@6xq.net> Change-Id: Ib77ffa937b878690d0e2d8964b534842b99da039 Sören Tempel
2024-02-19gnu: Add ghc-7.0....* gnu/packages/haskell.scm (ghc-7.0): New variable. Change-Id: I6b05c5fa87dca1d9fbea6b782b64e3d005d76c1c Efraim Flashner