diff options
| author | Lukas Larsson <[email protected]> | 2017-09-11 15:15:57 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2017-09-11 15:15:57 +0200 |
| commit | 3b916092c488ef9d1fe93ab9c0afda88d589d97e (patch) | |
| tree | 07ef98d2993f4c7da9df355371628528248584f5 /lib/syntax_tools | |
| parent | c15bb1698267ae64aac08b3b48040c44174700e5 (diff) | |
| parent | 69721d73cb00e31e6b27ccdd363991cb1965b869 (diff) | |
| download | otp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.tar.gz otp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.tar.bz2 otp-3b916092c488ef9d1fe93ab9c0afda88d589d97e.zip | |
Merge branch 'lukas/erts/non-smp-removal-cleanup/OTP-14518'
* lukas/erts/non-smp-removal-cleanup/OTP-14518:
Make estone work with older releases
erts: Allow read in ttsl driver to return EAGAIN
syntax_tools: Fix makefile dep
erts: non-smp removal cleanup in erlexec
Diffstat (limited to 'lib/syntax_tools')
| -rw-r--r-- | lib/syntax_tools/src/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile index 8325db45a8..c21d2f49c8 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile @@ -75,7 +75,7 @@ $(EBIN)/%.$(EMULATOR):%.erl # special rules and dependencies to apply the transform to itself $(EBIN)/merl_transform.beam: $(EBIN)/merl.beam ./merl_transform.beam \ - ../include/merl.hrl \ + ../include/merl.hrl $(EBIN)/erl_comment_scan.beam \ $(EBIN)/erl_syntax.beam $(EBIN)/erl_syntax_lib.beam ./merl_transform.beam: ./merl_transform.erl $(EBIN)/merl.beam \ ../include/merl.hrl |