Hassan Al-Awwadi pushed to branch wip/haanss/depdir at Glasgow Haskell Compiler / GHC
Commits:
-
d4ae1992
by Hassan Al-Awwadi at 2025-07-07T17:52:23+02:00
7 changed files:
- compiler/GHC/HsToCore/Usage.hs
- compiler/GHC/Unit/Finder.hs
- compiler/GHC/Utils/Fingerprint.hs
- libraries/base/src/GHC/Fingerprint.hs
- libraries/ghc-internal/src/GHC/Internal/Fingerprint.hs
- libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs
- testsuite/tests/th/Makefile
Changes:
| ... | ... | @@ -2,7 +2,7 @@ module GHC.HsToCore.Usage ( |
| 2 | 2 | -- * Dependency/fingerprinting code (used by GHC.Iface.Make)
|
| 3 | 3 | mkUsageInfo, mkUsedNames,
|
| 4 | 4 | |
| 5 | - UsageConfig(..)
|
|
| 5 | + UsageConfig(..),
|
|
| 6 | 6 | ) where
|
| 7 | 7 | |
| 8 | 8 | import GHC.Prelude
|
| ... | ... | @@ -32,7 +32,7 @@ module GHC.Unit.Finder ( |
| 32 | 32 | findObjectLinkableMaybe,
|
| 33 | 33 | findObjectLinkable,
|
| 34 | 34 | |
| 35 | - -- important that GHC.HsToCore.Usage uses the same hashing method for usage dirs as is done here.
|
|
| 35 | + -- important that GHC.HsToCore.Usage uses the same hashing method for usage dirs as is used here.
|
|
| 36 | 36 | getDirHash,
|
| 37 | 37 | ) where
|
| 38 | 38 |
| ... | ... | @@ -20,7 +20,7 @@ module GHC.Utils.Fingerprint ( |
| 20 | 20 | fingerprintData,
|
| 21 | 21 | fingerprintString,
|
| 22 | 22 | fingerprintStrings,
|
| 23 | - getFileHash,
|
|
| 23 | + getFileHash
|
|
| 24 | 24 | ) where
|
| 25 | 25 | |
| 26 | 26 | import GHC.Prelude.Basic
|
| ... | ... | @@ -5,7 +5,7 @@ module GHC.Fingerprint ( |
| 5 | 5 | fingerprintData,
|
| 6 | 6 | fingerprintString,
|
| 7 | 7 | fingerprintFingerprints,
|
| 8 | - getFileHash,
|
|
| 8 | + getFileHash
|
|
| 9 | 9 | ) where
|
| 10 | 10 | |
| 11 | 11 | import GHC.Internal.Fingerprint |
| ... | ... | @@ -16,7 +16,7 @@ module GHC.Internal.Fingerprint ( |
| 16 | 16 | fingerprintData,
|
| 17 | 17 | fingerprintString,
|
| 18 | 18 | fingerprintFingerprints,
|
| 19 | - getFileHash,
|
|
| 19 | + getFileHash
|
|
| 20 | 20 | ) where
|
| 21 | 21 | |
| 22 | 22 | import GHC.Internal.IO
|
| ... | ... | @@ -830,7 +830,7 @@ getPackageRoot = Q qGetPackageRoot |
| 830 | 830 | -- The compiler can then recognize that it should re-compile the Haskell file
|
| 831 | 831 | -- when a directory changes.
|
| 832 | 832 | --
|
| 833 | --- Expects an absolute file path.
|
|
| 833 | +-- Expects an absolute directory path.
|
|
| 834 | 834 | --
|
| 835 | 835 | -- Notes:
|
| 836 | 836 | --
|
| ... | ... | @@ -45,12 +45,12 @@ TH_Depends: |
| 45 | 45 | |
| 46 | 46 | .PHONY: TH_Depends_Dir
|
| 47 | 47 | TH_Depends_Dir:
|
| 48 | - $(RM) TH_Depends_external/dummy.txt
|
|
| 48 | + rm -rf TH_Depends_external
|
|
| 49 | 49 | $(RM) TH_Depends TH_Depends.exe
|
| 50 | 50 | $(RM) TH_Depends.o TH_Depends.hi
|
| 51 | 51 | $(RM) TH_Depends_External.o TH_Depends_External.hi
|
| 52 | -
|
|
| 53 | - mk_DIR TH_Depends_external
|
|
| 52 | + |
|
| 53 | + mkdir TH_Depends_external
|
|
| 54 | 54 | '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -v0 TH_Depends_Dir
|
| 55 | 55 | ./TH_Depends_Dir
|
| 56 | 56 | sleep 2
|