From 4fd27fda27e805fd52d38926a6bc66ad59fcfbd3 Mon Sep 17 00:00:00 2001 From: Tom Smeding Date: Wed, 30 Oct 2024 18:18:37 +0100 Subject: [PATCH] b3cc patch: remove tracy submodule to not confuse cabal The relevant cabal PR is https://github.com/haskell/cabal/pull/10190 , which is not yet included in any released cabal version. It will be in 3.14, presumably. --- .gitmodules | 7 ------- Setup.hs | 4 ++++ cbits/tracy | 1 - 3 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 .gitmodules delete mode 160000 cbits/tracy diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 56d68671a..000000000 --- a/.gitmodules +++ /dev/null @@ -1,7 +0,0 @@ -# This is on a fork only for the following commit: -# https://github.com/wolfpld/tracy/commit/1a971d867d6fa5bf6dc57d705dcbbc6020031e7a -# which fixes a dumb compile error. -# When tracy publishes something > v0.10, please upgrade to that instead. -[submodule "cbits/tracy"] - path = cbits/tracy - url = https://github.com/tomsmeding/tracy.git diff --git a/Setup.hs b/Setup.hs index f0f06bfb3..4285dfa9f 100755 --- a/Setup.hs +++ b/Setup.hs @@ -30,6 +30,10 @@ preConfHook args config_flags = do debugging = fromMaybe False $ lookupFlagAssignment (mkFlagName "debug") (configConfigurationsFlags config_flags) when debugging $ do + dieNoVerbosity $ "In this version of Accelerate, debug mode is disabled to \ + \prevent problems with cabal on Windows. The problems will\ + \be fixed in Cabal 3.14, which is not yet released." + yes <- doesFileExist "cbits/tracy/public/TracyClient.cpp" if yes then diff --git a/cbits/tracy b/cbits/tracy deleted file mode 160000 index 821ef62c1..000000000 --- a/cbits/tracy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 821ef62c1db9a11231bf216a30b1ebfaedfe2244