Update erlang.mk
This commit is contained in:
parent
27392722be
commit
241e448d27
|
|
@ -17,7 +17,7 @@
|
||||||
ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
|
ERLANG_MK_FILENAME := $(realpath $(lastword $(MAKEFILE_LIST)))
|
||||||
export ERLANG_MK_FILENAME
|
export ERLANG_MK_FILENAME
|
||||||
|
|
||||||
ERLANG_MK_VERSION = 2.0.0-pre.2-493-g40c2b81
|
ERLANG_MK_VERSION = 2.0.0-pre.2-495-g8217957
|
||||||
ERLANG_MK_WITHOUT =
|
ERLANG_MK_WITHOUT =
|
||||||
|
|
||||||
# Make 3.81 and 3.82 are deprecated.
|
# Make 3.81 and 3.82 are deprecated.
|
||||||
|
|
@ -185,7 +185,7 @@ core_http_get = curl -Lf$(if $(filter-out 0,$(V)),,s)o $(call core_native_path,$
|
||||||
core_eq = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
|
core_eq = $(and $(findstring $(1),$(2)),$(findstring $(2),$(1)))
|
||||||
|
|
||||||
# We skip files that contain spaces because they end up causing issues.
|
# We skip files that contain spaces because they end up causing issues.
|
||||||
core_find = $(if $(wildcard $1),$(shell find $(1:%/=%) -type f -name $(subst *,\*,$2) | grep -v " "))
|
core_find = $(if $(wildcard $1),$(shell find $(1:%/=%) \( -type l -o -type f \) -name $(subst *,\*,$2) | grep -v " "))
|
||||||
|
|
||||||
core_lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$(1)))))))))))))))))))))))))))
|
core_lc = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$(1)))))))))))))))))))))))))))
|
||||||
|
|
||||||
|
|
@ -5306,11 +5306,11 @@ define makedep.erl
|
||||||
string:join(DirSubname ++ [atom_to_list(Target)], "/")
|
string:join(DirSubname ++ [atom_to_list(Target)], "/")
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
ok = file:write_file("$(1)", [
|
ok = file:write_file("$(1)", unicode:characters_to_binary([
|
||||||
"# Generated by Erlang.mk. Edit at your own risk!\n\n",
|
"# Generated by Erlang.mk. Edit at your own risk!\n\n",
|
||||||
[[F, "::", [[" ", D] || D <- Deps], "; @touch \$$@\n"] || {F, Deps} <- Depend],
|
[[F, "::", [[" ", D] || D <- Deps], "; @touch \$$@\n"] || {F, Deps} <- Depend],
|
||||||
"\nCOMPILE_FIRST +=", [[" ", TargetPath(CF)] || CF <- CompileFirst], "\n"
|
"\nCOMPILE_FIRST +=", [[" ", TargetPath(CF)] || CF <- CompileFirst], "\n"
|
||||||
]),
|
])),
|
||||||
halt()
|
halt()
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue