diff options
author | Henrik Nord <[email protected]> | 2011-04-01 15:11:41 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-04-01 15:16:52 +0200 |
commit | 5d3c00624934c700c4fa13044e6de3bfe08d2d50 (patch) | |
tree | 65e3befbf94b8002b8c00f7b78cb4a16d2393e34 /lib/tools/src | |
parent | efd032654990280daee58463b3208ef843008a2a (diff) | |
parent | 5e9d05198cd00f74b99f697eb022ae0b2f31f136 (diff) | |
download | otp-5d3c00624934c700c4fa13044e6de3bfe08d2d50.tar.gz otp-5d3c00624934c700c4fa13044e6de3bfe08d2d50.tar.bz2 otp-5d3c00624934c700c4fa13044e6de3bfe08d2d50.zip |
Merge branch 'sb/make-files-like-erlc' into dev
* sb/make-files-like-erlc:
Change make:files to behave more like erlc
OTP-9179
Diffstat (limited to 'lib/tools/src')
-rw-r--r-- | lib/tools/src/make.erl | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/lib/tools/src/make.erl b/lib/tools/src/make.erl index 77c354651b..e78e2a43a4 100644 --- a/lib/tools/src/make.erl +++ b/lib/tools/src/make.erl @@ -222,12 +222,7 @@ recompilep(File, NoExec, Load, Opts) -> recompilep1(File, NoExec, Load, Opts, ObjFile) -> {ok, Erl} = file:read_file_info(lists:append(File, ".erl")), {ok, Obj} = file:read_file_info(ObjFile), - case {readable(Erl), writable(Obj)} of - {true, true} -> - recompilep1(Erl, Obj, File, NoExec, Load, Opts); - _ -> - error - end. + recompilep1(Erl, Obj, File, NoExec, Load, Opts). recompilep1(#file_info{mtime=Te}, #file_info{mtime=To}, File, NoExec, Load, Opts) when Te>To -> @@ -277,14 +272,6 @@ exists(File) -> false end. -readable(#file_info{access=read_write}) -> true; -readable(#file_info{access=read}) -> true; -readable(_) -> false. - -writable(#file_info{access=read_write}) -> true; -writable(#file_info{access=write}) -> true; -writable(_) -> false. - coerce_2_list(X) when is_atom(X) -> atom_to_list(X); coerce_2_list(X) -> |