diff options
| author | Loïc Hoguin <[email protected]> | 2018-12-10 12:28:57 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2018-12-10 12:28:57 +0100 |
| commit | 7799804277e6fd38d308ebd581d194c38cd3fbb4 (patch) | |
| tree | 55831b4d5e1583fe803512273ba735ba65e3c811 | |
| parent | a3cd50792d0ed1c5dfee66ff79ee7117057e9970 (diff) | |
| download | erlang.mk-7799804277e6fd38d308ebd581d194c38cd3fbb4.tar.gz erlang.mk-7799804277e6fd38d308ebd581d194c38cd3fbb4.tar.bz2 erlang.mk-7799804277e6fd38d308ebd581d194c38cd3fbb4.zip | |
Correct expanding of shell variables in autopatch again
This solution should work better, previous one would sometimes
expand incorrectly and fail.
| -rw-r--r-- | core/deps.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/deps.mk b/core/deps.mk index ed92daf..bfcae30 100644 --- a/core/deps.mk +++ b/core/deps.mk @@ -395,7 +395,7 @@ define dep_autopatch_rebar.erl end(), ShellToMk = fun(V0) -> V1 = re:replace(V0, "[$$][(]", "$$\(shell ", [global]), - V = re:replace(V1, "(\\\\$$$$)(?![(])(\\\\w*)", "\\\\1(\\\\2)", [global]), + V = re:replace(V1, "([$$])(?![(])(\\\\w*)", "\\\\1(\\\\2)", [global]), re:replace(V, "-Werror\\\\b", "", [{return, list}, global]) end, PortSpecs = fun() -> |