diff options
| author | Dan Gudmundsson <dgud@erlang.org> | 2020-01-08 12:36:02 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <dgud@erlang.org> | 2020-01-08 12:36:02 +0100 |
| commit | 8ff0284174252788bafb6b616d0fa09ef51a1ed6 (patch) | |
| tree | 67e68124b6a6b6bea84fa22964facf6a6e221ae3 /.gitignore | |
| parent | 83c68a5e9cebdd00d00bbf8e5de20ce928e0172f (diff) | |
| parent | 9249a4479ce4c7956eea6bfba731b6a2af7fc123 (diff) | |
| download | erlang-8ff0284174252788bafb6b616d0fa09ef51a1ed6.tar.gz | |
Merge branch 'dgud/build-WSL'
* dgud/build-WSL:
Add missing files to gitignore
Make build installer work from WSL
Fix deps generation on Windows
Support ssl-1.1.1 on windows when building crypto
Setup VC env in otp_build
Add wsl config as an environment to otp build tools
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 30f89872ea..4528cd6cdb 100644 --- a/.gitignore +++ b/.gitignore @@ -56,8 +56,10 @@ a.out.dSYM/ # Windows *.pdb +local.static.config.cache tcltk85_win32_bin.tar.gz erts/autoconf/win32.config.cache +erts/autoconf/win64.config.cache erts/emulator/obj/ erts/emulator/pcre/obj/ erts/emulator/pcre/win32/ @@ -68,6 +70,9 @@ erts/epmd/src/win32/ erts/etc/common/Install.ini erts/etc/common/win32/ erts/etc/win32/cygwin_tools/vc/coffix.exe +erts/etc/win32/wsl_tools/vc/coffix.exe +erts/etc/win32/nsis/helper.* +erts/etc/win32/nsis/hello.* erts/include/internal/win32/ erts/include/win32/ erts/lib/internal/win32/ |