diff options
author | David Allsopp <david.allsopp@metastack.com> | 2019-05-14 14:03:43 +0100 |
---|---|---|
committer | Sébastien Hinderer <Sebastien.Hinderer@inria.fr> | 2019-05-14 15:03:43 +0200 |
commit | 049f4e53ecb5d32bd7a19e8611068dcda545606c (patch) | |
tree | f433cec2fdb6e5705f5e7e37a5b22ad4314e7cb7 /.gitattributes | |
parent | 14b37dfc2ec5248daed2f03debbce12c395378b9 (diff) | |
download | ocaml-049f4e53ecb5d32bd7a19e8611068dcda545606c.tar.gz |
config/Makefile.m* tidy (#8640)
* Make s-nt.h and m-nt.h more autoconf-like
* Add SIZEOF_LONGLONG to m-nt.h
It's not used, but autoconf will generate it.
* Sections of s-nt.h and m-nt moved to config.h
* Re-order lines of s-nt.h
Allows the output to be more readily compared with autoconf's generated
s.h. Lines are purely reordered so:
diff <(git cat-file --textconv HEAD~1:config/s-nt.h | sort) \
<(git cat-file --textconv HEAD:config/s-nt.h | sort)
should return no differences.
* Add extra defines to s-nt.h for mingw32
These match up with facts determined by autoconf. The following
additional HAS_ defines are made:
- HAS_UNISTD
Behaviour of otherlibs/unix/access.c and otherlibs/win32unix/lseek.c
is affected but the effect is correct.
Behaviour of runtime/fix_code.c affected, but unistd.h includes
io.h, so there's no effective change.
In other cases, unistd.h is simply included where before it wasn't.
- HAS_DIRENT
Used in Unix-only closedir.c, opendir.c, readdir.c and rewinddir.c
Used in runtime/unix.c, but that obviously won't affect Windows!
- HAS_REWINDDIR
Used in Unix-only rewinddir.c
- HAS_TRUNCATE
Used in Unix-only ftruncate.c, mmap.c and truncate.c
- HAS_NANOSLEEP
Used in Unix-only sleep.c
- HAS_GETTIMEOFDAY
Used in vmthreads and Unix-only gettimeofday.c
Used in runtime/sys.c, but in a branch guarded by #ifndef _WIN32
- HAS_MKSTEMP
Changes yacc/main.c to use the MinGW implementation of mkstemp
(part of mingwex, which is linked by flexdll)
* Remove the old DISTRIB variable
This variable was originally added in 1973b55 and 1596174 and was always
specifically for Windows for installing the README files.
This should have been renamed to INSTALL_DISTRIB in de4f4cf (which was
part of MPR#6358/GPR#27). It should then have been removed in 13bb9d2
(GPR#1033).
May it forever rest in peace.
* Tweak the config/Makefile.m* to match autoconf
* Build debug runtime by default on Windows
* Build raw_spacetime_lib on msvc64 & mingw64
* Set ENABLE_CALL_COUNTS to true for Windows
No-op, since spacetime is not enabled by default, but easier comparison
with autoconf
* Remove X11 definitions from old Makefiles
win32graph removed in #2318
* mingw ports should use gcc for CPP
* Correct MKEXEDEBUGFLAG for mingw ports
-g is ignored by flexlink, -link -g is passed on to GCC.
* Correct SO to be dll not s.obj/s.o
Pedantic correction - $(SO) is not used by the Windows ports.
* Re-order lines of config/Makefile.m*
Diffstat (limited to '.gitattributes')
-rw-r--r-- | .gitattributes | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes index 214412f107..bc4401f281 100644 --- a/.gitattributes +++ b/.gitattributes @@ -74,6 +74,8 @@ 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 +# For comparison with autoconf, some overlong lines are now permitted. +config/Makefile.m* typo.long-line /config/gnu typo.prune /config/gnu/** typo.prune |