Skip to content

Commit 6be98c8

Browse files
committed
---
yaml --- r: 1823 b: refs/heads/master c: 9b617da h: refs/heads/master i: 1821: c9bad4a 1819: d578ef7 1815: b45d819 1807: 1a9a431 1791: 85b2f30 v: v3
1 parent 65c4755 commit 6be98c8

File tree

2 files changed

+6
-14
lines changed

2 files changed

+6
-14
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 0b63512f4cb0aca1579b110d9104eeed4918a6eb
2+
refs/heads/master: 9b617dab3c6a563d7c31dabcd0fba5c6342c09c1

trunk/configure

+5-13
Original file line numberDiff line numberDiff line change
@@ -77,24 +77,16 @@ need_cmd cp
7777
need_cmd find
7878
need_cmd uname
7979
need_cmd date
80+
need_cmd tr
8081

8182
msg "inspecting environment"
8283

8384
CFG_OSTYPE=$(uname -s)
8485
CFG_CPUTYPE=$(uname -m)
8586

86-
case $CFG_OSTYPE in
87-
88-
MINGW*)
89-
CFG_SRC_DIR=${0%${0##*\\}}
90-
CFG_BUILD_DIR=$PWD
91-
;;
92-
93-
*)
94-
CFG_SRC_DIR=${0%${0##*/}}
95-
CFG_BUILD_DIR=$PWD
96-
;;
97-
esac
87+
CFG_SELF=$(echo $0 | tr '\' '/')
88+
CFG_SRC_DIR=${CFG_SELF%${CFG_SELF##*/}}
89+
CFG_BUILD_DIR=$(echo $PWD | tr '\' '/')
9890

9991
msg "recreating config.mk"
10092
echo '' >config.mk
@@ -180,7 +172,7 @@ putvar CFG_LLVM_LDFLAGS
180172
putvar CFG_LLVM_LIBS
181173

182174
# Munge any paths that appear in config.mk back to posix-y
183-
perl -i.bak -p -e 's@ ([a-zA-Z]):\\@ /\1/@go;' \
175+
perl -i.bak -p -e 's@ ([a-zA-Z]):[/\\]@ /\1/@go;' \
184176
-e 's@\\@/@go;' config.mk
185177
rm -f config.mk.bak
186178

0 commit comments

Comments
 (0)