summaryrefslogtreecommitdiff
path: root/set_soenv.in
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2010-09-17 00:05:22 +0300
committerTor Lillqvist <tml@hemulen.(none)>2010-09-17 00:05:55 +0300
commit31b5763489f7473c7993c90318093f0ac9ef9651 (patch)
tree5af01bd422b657d858da273cd87931f2760dc34e /set_soenv.in
parentac4fb24b15313d1419e696f2eaeaa939c66f9615 (diff)
Avoid symlinks in solenv path on Cygwin
Diffstat (limited to 'set_soenv.in')
-rw-r--r--set_soenv.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/set_soenv.in b/set_soenv.in
index 502ab5e67b99..d050c4bd1141 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -994,7 +994,7 @@ $DEVROOT = '$SRC_ROOT';
# Set solenv and solver to given or default values.
# Location of the solenv tree.
if ('@LOCAL_SOLENV@' eq "DEFAULT")
-{ $SOLARENV = $SRC_ROOT.$SOLENV;
+{ $SOLARENV = PathFormat($SRC_ROOT.$SOLENV);
}
else
{ $SOLARENV = PathFormat('@LOCAL_SOLENV@');
@@ -2321,6 +2321,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{cygpath -m "$variable"} );
}
}