summaryrefslogtreecommitdiff
path: root/set_soenv.in
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-04-18 12:21:34 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-05-15 03:41:58 +0300
commitc552c7faf103c7832020c7e1be4774004b28779c (patch)
tree93a3409805c4d8e2de094e2c1f4e042156af1744 /set_soenv.in
parentbc5a2dab0f478662e9563ffe544ff0f719b1a163 (diff)
Fix from-scratch build breakage: Don't call realpath on Windows path
In a from-scratch build, when running the configure script, which then runs the set_soenv script, the default_images symlink (that is passed to this function in the form of a Windows path, for some reason) does not exist yet, and realpath fails anyway. So don't bother calling realpath on Windows paths. Although I don't know whether it then will cause a problem that the cygpath -m call won't be able to expand the symlink as it doesn't exist anyway. This is a mess. And if cygpath -m expands symlinks anyway, why is the realpath needed at all?
Diffstat (limited to 'set_soenv.in')
-rwxr-xr-xset_soenv.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/set_soenv.in b/set_soenv.in
index 64a041817dc7..2ea044a86498 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -2263,7 +2263,7 @@ sub PathFormat
# Replace absolute paths or DOS paths with ...
if ( ( $variable =~ m/^\// ) or ( $variable =~ m/:/ ) ) {
# mixed mode paths
- chomp( $variable = qx{realpath "$variable"} );
+ chomp( $variable = qx{realpath "$variable"} ) unless ($variable =~ m/:/);
chomp( $variable = qx{cygpath -m "$variable"} );
}
}