drop hooks in favour of using bundled libraries properly

script addition is hacky, but I know no other way to get most of the build path, in arch/version-independent way
we'll use a custom setup or whatever eventually (_eventually_ hooks...) anyway
This commit is contained in:
George Thomas 2026-03-03 20:58:41 +00:00
parent ffc59a418b
commit beb9e14542
3 changed files with 3 additions and 41 deletions

View File

@ -1,33 +0,0 @@
{-# LANGUAGE DisambiguateRecordFields #-}
{-# LANGUAGE DuplicateRecordFields #-}
{-# LANGUAGE NoFieldSelectors #-}
module SetupHooks (setupHooks) where
import Distribution.Simple.SetupHooks
import Distribution.Utils.Path
import System.Directory
setupHooks :: SetupHooks
setupHooks =
noSetupHooks
{ configureHooks =
noConfigureHooks
{ preConfComponentHook = Just addRustLibDir
}
}
addRustLibDir :: PreConfComponentInputs -> IO PreConfComponentOutputs
addRustLibDir inputs = do
cwd <- getCurrentDirectory
pure
(noPreConfComponentOutputs inputs :: PreConfComponentOutputs)
{ componentDiff =
buildInfoComponentDiff
(componentName (component inputs))
emptyBuildInfo
{ extraLibDirs =
[ makeSymbolicPath $ cwd </> "rust" </> "target" </> "debug"
]
}
}

View File

@ -6,14 +6,6 @@ author: Patrick Aldis
maintainer:
george.thomas@obsidian.systems
patrick.aldis@obsidian.systems
build-type: Hooks
custom-setup
setup-depends:
base,
Cabal-hooks,
Cabal-syntax,
directory,
common common
default-language: GHC2024

View File

@ -59,3 +59,6 @@ echo " Patched header at $HEADER"
echo "=== Done ==="
echo "Run 'cabal run' to test."
# place static lib in position for bundling with Cabal
cp rust/target/debug/libgarnet_rs.a $(cabal list-bin . | sed -e 's=x/garnet/build/garnet/garnet=build=g')