diff options
| author | Erlang/OTP <[email protected]> | 2017-06-30 15:20:48 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2017-06-30 15:20:48 +0200 |
| commit | 921c88d10ef1e92d30d71aea38af07d63a5c2611 (patch) | |
| tree | 087d818a9a42f106c9b3a8a10196e0d50a8b708c /lib/stdlib/src | |
| parent | c73d8d9feb9b0ebc988bd44ed340988df12c53b2 (diff) | |
| parent | 3defef54fba953cb4ab5298dacc15af9c9bd25ec (diff) | |
| download | otp-921c88d10ef1e92d30d71aea38af07d63a5c2611.tar.gz otp-921c88d10ef1e92d30d71aea38af07d63a5c2611.tar.bz2 otp-921c88d10ef1e92d30d71aea38af07d63a5c2611.zip | |
Merge branch 'siri/make/default-outdir/ERL-438/OTP-14489' into maint-20
* siri/make/default-outdir/ERL-438/OTP-14489:
[ct_make] Do not use the interactive tool 'c' from ct_make
Use current dir as default outdir for c:c/1,2
[make] Do not use the interactive tool 'c' from make
Diffstat (limited to 'lib/stdlib/src')
| -rw-r--r-- | lib/stdlib/src/c.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/c.erl b/lib/stdlib/src/c.erl index 4ab9234b81..c04a201ce1 100644 --- a/lib/stdlib/src/c.erl +++ b/lib/stdlib/src/c.erl @@ -255,7 +255,7 @@ safe_recompile(File, Options, BeamFile) -> compile_and_load(File, Opts0) when is_list(Opts0) -> Opts = [report_errors, report_warnings | ensure_from(filename:extension(File), - ensure_outdir(filename:dirname(File), Opts0))], + ensure_outdir(".", Opts0))], case compile:file(File, Opts) of {ok,Mod} -> %Listing file. purge_and_load(Mod, File, Opts); |