Skip to content

Commit

Permalink
Merge pull request #521 from MatthewFluet/build-reqs
Browse files Browse the repository at this point in the history
Update Build requirements documentation
  • Loading branch information
MatthewFluet authored Nov 1, 2023
2 parents 326fb7c + bcfeeae commit 537750a
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
5 changes: 2 additions & 3 deletions Makefile.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Copyright (C) 2009,2011,2013,2017-2022 Matthew Fluet.
## Copyright (C) 2009,2011,2013,2017-2023 Matthew Fluet.
# Copyright (C) 1999-2007 Henry Cejtin, Matthew Fluet, Suresh
# Jagannathan, and Stephen Weeks.
# Copyright (C) 1997-2000 NEC Research Institute.
Expand Down Expand Up @@ -225,8 +225,7 @@ MLTON_OUTPUT_SMLNJ_HEAP := $(MLTON_OUTPUT)-smlnj.$(SMLNJ_HEAP_SUFFIX)

######################################################################

POLYML_POLY := poly
POLYML_POLYC := polyc
POLYC := polyc

######################################################################

Expand Down
10 changes: 6 additions & 4 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,12 @@ a lexer generator, a parser generator, and a profiler.
* http://savannah.gnu.org/projects/make[GNU Make]
* http://www.gnu.org/software/bash/[GNU Bash]
* binutils (`ar`, `ranlib`, `strip`, ...)
* miscellaneous Unix utilities (`diff`, `find`, `grep`, `gzip`, `patch`, `sed`, `tar`, `xargs`, ...)
* Standard{nbsp}ML compiler and tools to bootstrap:
- http://mlton.org[MLton] (`mlton`, `mllex`, and `mlyacc`) recommended. Pre-built binary packages for MLton can be installed via an OS package manager or (for select platforms) obtained from `http://mlton.org`.
- http://www.smlnj.org[SML/NJ] (`sml`, `ml-lex`, `ml-yacc`) supported, but not recommended.
* miscellaneous Unix utilities (`diff`, `find`, `grep`, `gzip`, `patch`, `sed`, `tar`, ...)
* Standard{nbsp}ML compiler to bootstrap:
- http://mlton.org[MLton] (`mlton`) recommended. Pre-built binary packages for MLton can be installed via an OS package manager or (for select platforms) obtained from `http://mlton.org`.
- http://www.smlnj.org[SML/NJ] (`sml`) supported, but not recommended.
- https://polyml.org[Poly/ML] (`polyc`) supported, but not recommended.
- https://elsman.com/mlkit[MLKit] (`mlkit`) supported, but not recommended.
* (optional, for documentation only) https://ctan.org/tex/[TeX], http://asciidoctor.org/[AsciiDoctor], http://rouge.jneen.net/[Rouge], http://www.graphicsmagick.org/[GraphicsMagick] or https://www.imagemagick.org/[ImageMagick], ...

==== Hardware
Expand Down
2 changes: 1 addition & 1 deletion mlton/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ ifneq (,$(findstring polyml-mlton,$(MAKECMDGOALS)))
polyml-mlton: $(MLTON_OUTPUT)-polyml

$(MLTON_OUTPUT)-polyml: mlton-polyml.sml $(shell [ -e mlton-polyml.sml ] && $(CAT) mlton-polyml.sml | $(SED) -n 's/use "\(.*\)";/\1/p') $(MLTON_GEN_SOURCES)
$(POLYML_POLYC) -o $@ mlton-polyml.sml
$(POLYC) -o $@ mlton-polyml.sml

mlton-polyml.sml: ../lib/stubs/polyml/basis/sources.use ../lib/stubs/polyml/mlton/sources.use $(shell $(MLBDEPS) ../lib/stubs/mlton-stubs/sources.mlb | $(GREP) 'mlb$$' | $(GREP) -v '$$(SML_LIB)') $(shell $(MLBDEPS) mlton.mlb | $(GREP) 'mlb$$' | $(GREP) -v '$$(SML_LIB)')
( \
Expand Down

0 comments on commit 537750a

Please sign in to comment.