diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-01-30 08:45:49 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-02-01 12:29:26 -0500 |
| commit | 88fba8a4b3c22e953a634b81dd0b67ec66eb5e72 (patch) | |
| tree | 75a46332ad32cfeaf4f4d52b3b60fd452f2493b6 /rules | |
| parent | 06185102bb06d6d56e00d40172a6a473fc228501 (diff) | |
| download | haskell-88fba8a4b3c22e953a634b81dd0b67ec66eb5e72.tar.gz | |
Fix a few Note inconsistencies
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-way.mk | 2 | ||||
| -rw-r--r-- | rules/build-prog.mk | 4 | ||||
| -rw-r--r-- | rules/hs-suffix-way-rules.mk | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 5ac137635e..2f7af28ecb 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -28,7 +28,7 @@ $1_$2_$3_LIB = $1/$2/build/$$($1_$2_$3_LIB_FILE) $$($1_$2_COMPONENT_ID)_$2_$3_LIB = $$($1_$2_$3_LIB) # Note [inconsistent distdirs] -# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # hack: the DEPS_LIBS mechanism assumes that the distdirs for packages # that depend on each other are the same, but that is not the case for # ghc where we use stage1/stage2 rather than dist/dist-install. diff --git a/rules/build-prog.mk b/rules/build-prog.mk index e7764d75a1..8d2bcd25c5 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -277,7 +277,9 @@ $1/$2/build/tmp/$$($1_$2_PROG) : $$($1_$2_$$($1_$2_PROGRAM_WAY)_HS_OBJS) $$($1_$ endif endif # $1_$2_PROG_NEEDS_C_WRAPPER -# Note [lib-depends] if this program is built with stage1 or greater, we +# Note [lib-depends] +# ~~~~~~~~~~~~~~~~~~ +# If this program is built with stage1 or greater, we # need to depend on the libraries too. NB. since $(ALL_STAGE1_LIBS) and # $(ALL_RTS_LIBS) are not defined until after libraries/*/ghc.mk have # been included, this introduces an ordering dependency. diff --git a/rules/hs-suffix-way-rules.mk b/rules/hs-suffix-way-rules.mk index da3d368c0b..e75d7b458e 100644 --- a/rules/hs-suffix-way-rules.mk +++ b/rules/hs-suffix-way-rules.mk @@ -30,7 +30,7 @@ $1/$2/build/%.$$(dyn_osuf)-boot: $1/$2/build/%.$$(v_hisuf)-boot else # Note [Implicit rule search algorithm] -# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # The order in which implicit rules are defined can influence a build. # # Case study: genprimops/Lexer.hs |