diff options
| author | Siri Hansen <[email protected]> | 2017-07-03 17:51:03 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2017-07-03 17:51:03 +0200 |
| commit | c5a6e3d99144c94ef557da5787c76f12737044d9 (patch) | |
| tree | 88692263714be5013829496eb0fd79e9a359c037 /lib/stdlib/src | |
| parent | 08d48990d9669d8123366a218f31697169390a27 (diff) | |
| parent | 3defef54fba953cb4ab5298dacc15af9c9bd25ec (diff) | |
| download | otp-c5a6e3d99144c94ef557da5787c76f12737044d9.tar.gz otp-c5a6e3d99144c94ef557da5787c76f12737044d9.tar.bz2 otp-c5a6e3d99144c94ef557da5787c76f12737044d9.zip | |
Merge branch 'siri/make/default-outdir/ERL-438/OTP-14489' into maint
* 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); |