diff options
| author | Marcus Arendt <[email protected]> | 2014-09-11 10:32:13 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-09-11 10:32:13 +0200 |
| commit | 0abec7199fcf362f139aef6976e00921c67b2d51 (patch) | |
| tree | 8fbc77cc268622eb7d88b56a8eb2b39a33453774 | |
| parent | 08c6c7b0f5cef8e3851ee23adcb9b8235f9b44d8 (diff) | |
| parent | 3c248c14a0f5eeab25a38e550e672e074affb79e (diff) | |
| download | otp-0abec7199fcf362f139aef6976e00921c67b2d51.tar.gz otp-0abec7199fcf362f139aef6976e00921c67b2d51.tar.bz2 otp-0abec7199fcf362f139aef6976e00921c67b2d51.zip | |
Merge branch 'maint'
Conflicts:
erts/preloaded/ebin/erl_prim_loader.beam
| -rw-r--r-- | erts/preloaded/ebin/erl_prim_loader.beam | bin | 56160 -> 56328 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erl_prim_loader.erl | 9 |
2 files changed, 8 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam Binary files differindex 74f76f045d..a019714c43 100644 --- a/erts/preloaded/ebin/erl_prim_loader.beam +++ b/erts/preloaded/ebin/erl_prim_loader.beam diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl index 466e0b0020..6b86a427ba 100644 --- a/erts/preloaded/src/erl_prim_loader.erl +++ b/erts/preloaded/src/erl_prim_loader.erl @@ -1507,7 +1507,14 @@ real_path(Name,[Path|Paths],Acc,Links) -> [""|_] = LinkPaths -> real_path(Name,LinkPaths++Paths,[],[ThisFile|Links]); LinkPaths -> - real_path(Name,LinkPaths++Paths,Acc,[ThisFile|Links]) + % windows currently does not allow creation of relative symlinks + % across different drives + case erlang:system_info(os_type) of + {win32, _} -> + real_path(Name,LinkPaths++Paths,[],[ThisFile|Links]); + _ -> + real_path(Name,LinkPaths++Paths,Acc,[ThisFile|Links]) + end end; _ -> real_path(Name,Paths,This,Links) |