Skip to content

Commit

Permalink
b3cc patch: remove tracy submodule to not confuse cabal
Browse files Browse the repository at this point in the history
The relevant cabal PR is haskell/cabal#10190 ,
which is not yet included in any released cabal version. It will be in
3.14, presumably.
  • Loading branch information
tomsmeding committed Dec 10, 2024
1 parent 02da616 commit 14963dc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 56 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "cbits/tracy"]
path = cbits/tracy
url = https://github.com/wolfpld/tracy.git
4 changes: 4 additions & 0 deletions Setup.hs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
56 changes: 4 additions & 52 deletions accelerate.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -142,58 +142,6 @@ extra-source-files:
cbits/xkcp/*.h
cbits/xkcp/*.macros
cbits/xkcp/*.inc
-- TRACY
-- These are referenced directly using the FFI
cbits/tracy/public/*.cpp
cbits/tracy/public/tracy/*.h
cbits/tracy/public/tracy/*.hpp
cbits/tracy/public/common/*.h
cbits/tracy/public/common/*.hpp
cbits/tracy/public/common/*.cpp
cbits/tracy/public/client/*.h
cbits/tracy/public/client/*.hpp
cbits/tracy/public/client/*.cpp
-- These are used to build Tracy's client tools in Setup.hs
cbits/tracy/cmake/*.cmake
cbits/tracy/capture/CMakeLists.txt
cbits/tracy/profiler/CMakeLists.txt
-- Used by the Tracy's client tools
cbits/tracy/capture/src/*.cpp
cbits/tracy/dtl/*.hpp
cbits/tracy/getopt/*.c
cbits/tracy/getopt/*.h
cbits/tracy/imgui/*.cpp
cbits/tracy/imgui/*.h
cbits/tracy/imgui/misc/freetype/*.cpp
cbits/tracy/imgui/misc/freetype/*.h
cbits/tracy/nfd/*.cpp
cbits/tracy/nfd/*.h
cbits/tracy/nfd/*.m
cbits/tracy/profiler/src/*.cpp
cbits/tracy/profiler/src/*.c
cbits/tracy/profiler/src/*.h
cbits/tracy/profiler/src/*.hpp
cbits/tracy/profiler/src/font/*.hpp
cbits/tracy/profiler/src/imgui/*.cpp
cbits/tracy/profiler/src/imgui/*.h
cbits/tracy/profiler/src/profiler/*.cpp
cbits/tracy/profiler/src/profiler/*.h
cbits/tracy/profiler/src/profiler/*.hpp
cbits/tracy/public/libbacktrace/*.cpp
cbits/tracy/public/libbacktrace/*.h
cbits/tracy/public/libbacktrace/*.hpp
cbits/tracy/server/*.cpp
cbits/tracy/server/*.h
cbits/tracy/server/*.hpp
cbits/tracy/zstd/*.h
cbits/tracy/zstd/common/*.c
cbits/tracy/zstd/common/*.h
cbits/tracy/zstd/compress/*.c
cbits/tracy/zstd/compress/*.h
cbits/tracy/zstd/decompress/*.c
cbits/tracy/zstd/decompress/*.h
cbits/tracy/zstd/dictBuilder/*.c
cbits/tracy/zstd/dictBuilder/*.h

extra-doc-files:
images/*.png
Expand Down Expand Up @@ -630,6 +578,10 @@ library
cpp-options:
-DACCELERATE_INTERNAL_CHECKS

-- Debug mode is disabled in this branch of Accelerate
if flag(debug)
buildable: False

if os(windows)
cc-options:
-- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65782
Expand Down
1 change: 0 additions & 1 deletion cbits/tracy
Submodule tracy deleted from 5d542d

0 comments on commit 14963dc

Please sign in to comment.