Skip to content

Commit 22b94a0

Browse files
committed
b3cc patch: remove tracy submodule to not confuse cabal
The relevant cabal PR is haskell/cabal#10190 , which is not yet included in any released cabal version. It will be in 3.16, presumably.
1 parent 2f3fee5 commit 22b94a0

File tree

4 files changed

+8
-39
lines changed

4 files changed

+8
-39
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

Setup.hs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ preConfHook args config_flags = do
3030
let verbosity = fromFlagOrDefault normal $ configVerbosity config_flags
3131

3232
when (tracyMode config_flags) $ do
33+
dieNoVerbosity $ "In this version of Accelerate, Tracy is disabled to \
34+
\prevent problems with cabal on Windows. The problems should\
35+
\be fixed in Cabal 3.16, which is not released yet."
36+
3337
yes <- doesFileExist "cbits/tracy/public/TracyClient.cpp"
3438
if yes
3539
then

accelerate.cabal

Lines changed: 4 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -142,41 +142,6 @@ extra-source-files:
142142
cbits/xkcp/*.h
143143
cbits/xkcp/*.macros
144144
cbits/xkcp/*.inc
145-
-- TRACY
146-
-- These are referenced directly using the FFI
147-
cbits/tracy/public/*.cpp
148-
cbits/tracy/public/tracy/*.h
149-
cbits/tracy/public/tracy/*.hpp
150-
cbits/tracy/public/common/*.h
151-
cbits/tracy/public/common/*.hpp
152-
cbits/tracy/public/common/*.cpp
153-
cbits/tracy/public/client/*.h
154-
cbits/tracy/public/client/*.hpp
155-
cbits/tracy/public/client/*.cpp
156-
-- These are used to build Tracy's client tools in Setup.hs
157-
cbits/tracy/cmake/*.cmake
158-
cbits/tracy/cmake/*.patch
159-
cbits/tracy/capture/CMakeLists.txt
160-
cbits/tracy/profiler/CMakeLists.txt
161-
-- Used by Tracy's client tools
162-
cbits/tracy/capture/src/*.cpp
163-
cbits/tracy/dtl/*.hpp
164-
cbits/tracy/getopt/*.c
165-
cbits/tracy/getopt/*.h
166-
cbits/tracy/profiler/src/*.cpp
167-
cbits/tracy/profiler/src/*.c
168-
cbits/tracy/profiler/src/*.h
169-
cbits/tracy/profiler/src/*.hpp
170-
cbits/tracy/profiler/src/font/*.hpp
171-
cbits/tracy/profiler/src/profiler/*.cpp
172-
cbits/tracy/profiler/src/profiler/*.h
173-
cbits/tracy/profiler/src/profiler/*.hpp
174-
cbits/tracy/public/libbacktrace/*.cpp
175-
cbits/tracy/public/libbacktrace/*.h
176-
cbits/tracy/public/libbacktrace/*.hpp
177-
cbits/tracy/server/*.cpp
178-
cbits/tracy/server/*.h
179-
cbits/tracy/server/*.hpp
180145

181146
extra-doc-files:
182147
images/*.png
@@ -629,6 +594,10 @@ library
629594
cpp-options:
630595
-DACCELERATE_INTERNAL_CHECKS
631596

597+
-- Tracy is disabled in this branch of Accelerate
598+
if flag(tracy)
599+
buildable: False
600+
632601
if os(windows)
633602
cc-options:
634603
-- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65782

cbits/tracy

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)