diff options
| author | Fredrik Gustafsson <[email protected]> | 2012-08-24 14:31:22 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2012-08-24 14:31:22 +0200 |
| commit | be7dd864c1c3be162a6963b6d2bad4092c0682a9 (patch) | |
| tree | ef942e47003345f3aa01640ddc6958c7baaa0cc2 | |
| parent | 0342137176c653c51cc3a78781888cfca8568650 (diff) | |
| parent | 6dc42270b83fef1f2f975d2dc2d9fce3433347c0 (diff) | |
| download | otp-be7dd864c1c3be162a6963b6d2bad4092c0682a9.tar.gz otp-be7dd864c1c3be162a6963b6d2bad4092c0682a9.tar.bz2 otp-be7dd864c1c3be162a6963b6d2bad4092c0682a9.zip | |
Merge branch 'rc/fix-MP-compiler-flag/OTP-10211' into maint
| -rw-r--r-- | erts/etc/common/erlc.c | 2 | ||||
| -rw-r--r-- | lib/compiler/test/compile_SUITE.erl | 6 | ||||
| -rw-r--r-- | lib/compiler/test/compile_SUITE_data/simple-phony.mk | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/erts/etc/common/erlc.c b/erts/etc/common/erlc.c index 0223cc5274..9f05213c95 100644 --- a/erts/etc/common/erlc.c +++ b/erts/etc/common/erlc.c @@ -335,7 +335,7 @@ main(int argc, char** argv) /* Push the following options: * o makedep_phony */ - buf = strsave("makedep_add_missing"); + buf = strsave("makedep_phony"); PUSH2("@option", buf); break; default: diff --git a/lib/compiler/test/compile_SUITE.erl b/lib/compiler/test/compile_SUITE.erl index da53a6ba9c..2cd75944f4 100644 --- a/lib/compiler/test/compile_SUITE.erl +++ b/lib/compiler/test/compile_SUITE.erl @@ -242,6 +242,12 @@ makedep(Config) when is_list(Config) -> [makedep,{makedep_output,Target}|IncludeOptions]), ?line {ok,Mf6} = file:read_file(Target), ?line BasicMf2 = makedep_canonicalize_result(Mf6, DataDir), + %% Rule with creating phony target. + ?line PhonyMfName = SimpleRootname ++ "-phony.mk", + ?line {ok,PhonyMf} = file:read_file(PhonyMfName), + ?line {ok,_,Mf7} = compile:file(Simple, + [binary,makedep,makedep_phony|IncludeOptions]), + ?line PhonyMf = makedep_canonicalize_result(Mf7, DataDir), ?line ok = file:delete(Target), ?line ok = file:del_dir(filename:dirname(Target)), diff --git a/lib/compiler/test/compile_SUITE_data/simple-phony.mk b/lib/compiler/test/compile_SUITE_data/simple-phony.mk new file mode 100644 index 0000000000..c84bcedd2a --- /dev/null +++ b/lib/compiler/test/compile_SUITE_data/simple-phony.mk @@ -0,0 +1,3 @@ +simple.beam: $(srcdir)/simple.erl $(srcdir)/include/simple.hrl + +$(srcdir)/include/simple.hrl: |