diff options
| author | Björn Gustavsson <[email protected]> | 2017-04-21 10:04:41 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-04-21 10:04:41 +0200 |
| commit | b80a70b1ca7ca73a6f1c0aece098e258a0c45595 (patch) | |
| tree | fecd8dd74d0fcb57af5886dff50e620946da40cd /erts/Makefile.in | |
| parent | 3f124994d35cbfc5158b89f91c16d4db6615d3fb (diff) | |
| parent | 830b575e4d1260e7780a792ffdea81f028d86f9d (diff) | |
| download | otp-b80a70b1ca7ca73a6f1c0aece098e258a0c45595.tar.gz otp-b80a70b1ca7ca73a6f1c0aece098e258a0c45595.tar.bz2 otp-b80a70b1ca7ca73a6f1c0aece098e258a0c45595.zip | |
Merge branch 'bjorn/dialyzer/add-typer/OTP-14336' into run-travis
* bjorn/dialyzer/add-typer/OTP-14336:
Add smoke test for TypER
Add back TypEr to the main OTP repository
Diffstat (limited to 'erts/Makefile.in')
| -rw-r--r-- | erts/Makefile.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/erts/Makefile.in b/erts/Makefile.in index cddabbecee..3052dc3065 100644 --- a/erts/Makefile.in +++ b/erts/Makefile.in @@ -75,10 +75,12 @@ local_setup: $(ERL_TOP)/bin/erl.exe $(ERL_TOP)/bin/erlc.exe \ $(ERL_TOP)/bin/escript $(ERL_TOP)/bin/escript.exe \ $(ERL_TOP)/bin/dialyzer $(ERL_TOP)/bin/dialyzer.exe \ + $(ERL_TOP)/bin/typer $(ERL_TOP)/bin/typer.exe \ $(ERL_TOP)/bin/ct_run $(ERL_TOP)/bin/ct_run.exe \ $(ERL_TOP)/bin/start*.boot $(ERL_TOP)/bin/start*.script @if [ "X$(TARGET)" = "Xwin32" ]; then \ cp $(ERL_TOP)/bin/$(TARGET)/dialyzer.exe $(ERL_TOP)/bin/dialyzer.exe; \ + cp $(ERL_TOP)/bin/$(TARGET)/typer.exe $(ERL_TOP)/bin/typer.exe; \ cp $(ERL_TOP)/bin/$(TARGET)/ct_run.exe $(ERL_TOP)/bin/ct_run.exe; \ cp $(ERL_TOP)/bin/$(TARGET)/erlc.exe $(ERL_TOP)/bin/erlc.exe; \ cp $(ERL_TOP)/bin/$(TARGET)/erl.exe $(ERL_TOP)/bin/erl.exe; \ @@ -98,6 +100,7 @@ local_setup: -e "s;%VSN%;$(VSN);" \ $(ERL_TOP)/erts/etc/unix/cerl.src > $(ERL_TOP)/bin/cerl; \ cp $(ERL_TOP)/bin/$(TARGET)/dialyzer $(ERL_TOP)/bin/dialyzer; \ + cp $(ERL_TOP)/bin/$(TARGET)/typer $(ERL_TOP)/bin/typer; \ cp $(ERL_TOP)/bin/$(TARGET)/ct_run $(ERL_TOP)/bin/ct_run; \ cp $(ERL_TOP)/bin/$(TARGET)/erlc $(ERL_TOP)/bin/erlc; \ cp $(ERL_TOP)/bin/$(TARGET)/escript $(ERL_TOP)/bin/escript; \ |