Skip to content

Commit

Permalink
build system: remove the config/ directory
Browse files Browse the repository at this point in the history
None of the files in this directory is used any more.

(cherry picked from commit 6bb155f)
  • Loading branch information
shindere authored and dra27 committed Jun 10, 2019
1 parent a4c81de commit 405cff3
Show file tree
Hide file tree
Showing 42 changed files with 8 additions and 5,311 deletions.
18 changes: 1 addition & 17 deletions .gitattributes
Expand Up @@ -74,9 +74,6 @@ asmcomp/*/emit.mlp typo.tab=may typo.long-line=may
# The build-aux directory contains bundled files so do not check it
build-aux typo.prune

/config/gnu typo.prune
/config/gnu/** typo.prune

/manual typo.prune
/manual/** typo.prune

Expand Down Expand Up @@ -149,15 +146,6 @@ build-aux/config.guess text eol=lf
build-aux/config.sub text eol=lf
build-aux/install text eol=lf
build-aux/missing text eol=lf
config/auto-aux/hasgot text eol=lf
config/auto-aux/hasgot2 text eol=lf
config/auto-aux/runtest text eol=lf
config/auto-aux/searchpath text eol=lf
config/auto-aux/solaris-ld text eol=lf
config/auto-aux/tryassemble text eol=lf
config/auto-aux/trycompile text eol=lf
config/gnu/config.guess text eol=lf
config/gnu/config.sub text eol=lf
ocamldoc/remove_DEBUG text eol=lf
ocamltest/getocamloptdefaultflags text eol=lf
stdlib/Compflags text eol=lf
Expand All @@ -178,11 +166,7 @@ tools/markdown-add-pr-links.sh text eol=lf
runtime/caml/m.h.in text eol=lf
runtime/caml/s.h.in text eol=lf

# These two are cat scripts, so may not actually require this
config/auto-aux/sharpbang text eol=lf
config/auto-aux/sharpbang2 text eol=lf

# Similarly, these are all Perl scripts, so may not actually require this
# These are all Perl scripts, so may not actually require this
manual/tools/caml-tex text eol=lf
manual/tools/format-intf text eol=lf
manual/tools/htmlcut text eol=lf
Expand Down
4 changes: 2 additions & 2 deletions HACKING.adoc
Expand Up @@ -179,13 +179,13 @@ has excellent documentation.
VERSION:: version string
asmcomp/:: native-code compiler and linker
boot/:: bootstrap compiler
build-aux/: autotools support scripts
bytecomp/:: bytecode compiler and linker
compilerlibs/:: the OCaml compiler as a library
config/:: configuration files
configure:: configure script
configure.ac: autoconf input file
debugger/:: source-level replay debugger
driver/:: driver code for the compilers
emacs/:: editing mode and debugger interface for GNU Emacs
flexdll/:: git submodule -- see link:README.win32.adoc[]
lex/:: lexer generator
man/:: man pages
Expand Down
7 changes: 4 additions & 3 deletions INSTALL.adoc
Expand Up @@ -59,9 +59,10 @@ By default, build is 32-bit. For 64-bit build, please set environment variable `
If something goes wrong during the automatic configuration, or if the generated
files cause errors later on, then look at the template files:

config/Makefile-templ
config/m-templ.h
config/s-templ.h
Makefile.config.in
Makefile.common.in
runtime/caml/m.h.in
runtime/caml/s.h.in
+
for guidance on how to edit the generated files by hand.

Expand Down
2 changes: 1 addition & 1 deletion Makefile.config.in
Expand Up @@ -243,7 +243,7 @@ else
MKEXE_BOOT=$(CC) $(OC_CFLAGS) $(OC_LDFLAGS) $(OUTPUTEXE)$(1) $(2)
endif # ifeq "$(TOOLCHAIN)" "msvc"

# The following variables were defined only in the config/Makefile.* files.
# The following variables were defined only in the Windows-specific makefiles.
# They were not defined by the configure script used on Unix systems,
# so we also make sure to provide them only under Windows
# User code should absolutely not rely on their presence because
Expand Down
197 changes: 0 additions & 197 deletions config/Makefile.mingw

This file was deleted.

0 comments on commit 405cff3

Please sign in to comment.