aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-08-24 14:32:10 +0200
committerFredrik Gustafsson <[email protected]>2012-08-24 14:32:10 +0200
commit9997bcfb630d860b9eeae29a08d953dc9afea01f (patch)
treeb485a504c8f97154e88d43e44ade2dfc91ecb2e8 /lib
parent7bb7e63fbada714655f0860a2d1daacbdc0d4712 (diff)
parentbe7dd864c1c3be162a6963b6d2bad4092c0682a9 (diff)
downloadotp-9997bcfb630d860b9eeae29a08d953dc9afea01f.tar.gz
otp-9997bcfb630d860b9eeae29a08d953dc9afea01f.tar.bz2
otp-9997bcfb630d860b9eeae29a08d953dc9afea01f.zip
Merge branch 'maint'
* maint: Fix the erlc -MP flag
Diffstat (limited to 'lib')
-rw-r--r--lib/compiler/test/compile_SUITE.erl6
-rw-r--r--lib/compiler/test/compile_SUITE_data/simple-phony.mk3
2 files changed, 9 insertions, 0 deletions
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: