summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2013-11-06 12:34:00 +0000
committerMarijke Hengstmengel <MHengstmengel@users.noreply.github.com>2013-11-06 12:34:00 +0000
commit0cc93c6a314cd1135bd527d362c05c38bd4c652e (patch)
tree7e965ec625475a0d52ba815c928f672a9abf2823
parent22643d5cc62c92f3cbb9e5879910c5f8d9bf84e5 (diff)
downloadATCD-0cc93c6a314cd1135bd527d362c05c38bd4c652e.tar.gz
Moved rel2abs from exe in commandline()
-rw-r--r--ACE/ChangeLog5
-rw-r--r--ACE/bin/PerlACE/Process_Unix.pm3
2 files changed, 6 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index f6ce11f90ea..3cc7834353b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 6 12:29:45 UTC 2013 Marijke Hengstmengel <MHengstmengel@remedy.nl>
+
+ * bin/PerlACE/Process_Unix.pm:
+ Moved rel2abs from exe in commandline()
+
Fri Nov 1 14:11:02 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_linux_clang.GNU:
diff --git a/ACE/bin/PerlACE/Process_Unix.pm b/ACE/bin/PerlACE/Process_Unix.pm
index 3ce8694c74a..759e392954d 100644
--- a/ACE/bin/PerlACE/Process_Unix.pm
+++ b/ACE/bin/PerlACE/Process_Unix.pm
@@ -131,11 +131,10 @@ sub CommandLine ()
my $exe = $self->Executable ();
- $exe = File::Spec->rel2abs ($exe);
-
if (defined $self->{TARGET} && defined $self->{TARGET}->{TARGET_FSROOT}) {
# If the target's config has a different filesystem root, rebase the executable
# from local root to the target's root.
+ $exe = File::Spec->rel2abs ($exe);
$exe = PerlACE::rebase_path ($exe,
$self->{TARGET}->{HOST_FSROOT},
$self->{TARGET}->{TARGET_FSROOT});