diff options
| author | Björn Gustavsson <[email protected]> | 2015-05-22 09:52:21 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2015-05-22 09:52:21 +0200 |
| commit | 1e40dcb96bb1bf858e857d6abe7770dec08a9409 (patch) | |
| tree | 6d750a075a89e488be97b644849c953200afbc5c | |
| parent | cfb049920057b7cf93582f6d222156c93ca07db7 (diff) | |
| parent | 242d0430103259398f87b088d8c3b0c8ba30124b (diff) | |
| download | otp-1e40dcb96bb1bf858e857d6abe7770dec08a9409.tar.gz otp-1e40dcb96bb1bf858e857d6abe7770dec08a9409.tar.bz2 otp-1e40dcb96bb1bf858e857d6abe7770dec08a9409.zip | |
Merge branch 'bjorn/compiler/runtime-dependencies'
* bjorn/compiler/runtime-dependencies:
Don't make 'compiler' dependent on 'tools'
Update runtime depencies for the compiler application
| -rw-r--r-- | lib/compiler/src/compile.erl | 6 | ||||
| -rw-r--r-- | lib/compiler/src/compiler.app.src | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/compiler/src/compile.erl b/lib/compiler/src/compile.erl index 22810c910c..0158cf64db 100644 --- a/lib/compiler/src/compile.erl +++ b/lib/compiler/src/compile.erl @@ -342,10 +342,10 @@ run_tc({Name,Fun}, St) -> run_eprof({Name,Fun}, Name, St) -> io:format("~p: Running eprof\n", [Name]), - eprof:start_profiling([self()]), + c:appcall(tools, eprof, start_profiling, [[self()]]), Val = (catch Fun(St)), - eprof:stop_profiling(), - eprof:analyze(), + c:appcall(tools, eprof, stop_profiling, []), + c:appcall(tools, eprof, analyze, []), Val; run_eprof({_,Fun}, _, St) -> catch Fun(St). diff --git a/lib/compiler/src/compiler.app.src b/lib/compiler/src/compiler.app.src index 2a40c1c379..17d1bd91ce 100644 --- a/lib/compiler/src/compiler.app.src +++ b/lib/compiler/src/compiler.app.src @@ -69,5 +69,5 @@ {registered, []}, {applications, [kernel, stdlib]}, {env, []}, - {runtime_dependencies, ["stdlib-2.0","kernel-3.0","hipe-3.10.3","erts-7.0", - "crypto-3.3"]}]}. + {runtime_dependencies, ["stdlib-2.5","kernel-4.0","hipe-3.12","erts-7.0", + "crypto-3.6"]}]}. |