diff options
| author | Björn Gustavsson <[email protected]> | 2015-06-02 12:17:16 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-06-02 12:17:16 +0200 |
| commit | 5367528299f5ea2c30923b8b19f35abac4de971a (patch) | |
| tree | 6ca24a1655b8903876e935f621a3002335c661c7 | |
| parent | 505b80e64f2587e8acb9c47ca816144699d5110c (diff) | |
| parent | b41830f01e38273a3fd39fd05b87cd3345d75d0d (diff) | |
| download | otp-5367528299f5ea2c30923b8b19f35abac4de971a.tar.gz otp-5367528299f5ea2c30923b8b19f35abac4de971a.tar.bz2 otp-5367528299f5ea2c30923b8b19f35abac4de971a.zip | |
Merge branch 'richcarl/syntax_tools/add-merl/OTP-12769'
* richcarl/syntax_tools/add-merl/OTP-12769:
syntax_tools app file: Update dependencies
Makefile: Eliminate crash when building with native libs
| -rw-r--r-- | lib/syntax_tools/src/Makefile | 3 | ||||
| -rw-r--r-- | lib/syntax_tools/src/syntax_tools.app.src | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile index 2c565cee7f..2e91adf8af 100644 --- a/lib/syntax_tools/src/Makefile +++ b/lib/syntax_tools/src/Makefile @@ -75,7 +75,8 @@ $(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_syntax.beam $(EBIN)/erl_syntax_lib.beam ./merl_transform.beam: ./merl_transform.erl $(EBIN)/merl.beam \ ../include/merl.hrl $(V_ERLC) -DMERL_NO_TRANSFORM $(ERL_COMPILE_FLAGS) -o ./ $< diff --git a/lib/syntax_tools/src/syntax_tools.app.src b/lib/syntax_tools/src/syntax_tools.app.src index e207901def..dd4ac46055 100644 --- a/lib/syntax_tools/src/syntax_tools.app.src +++ b/lib/syntax_tools/src/syntax_tools.app.src @@ -17,4 +17,5 @@ {registered,[]}, {applications, [stdlib]}, {env, []}, - {runtime_dependencies, ["stdlib-2.5","kernel-3.0","erts-6.0"]}]}. + {runtime_dependencies, + ["compiler-6.0","erts-6.0","kernel-3.0","stdlib-2.5"]}]}. |