Skip to content

Commit 9b617da

Browse files
committed
More bandaids for win32.
1 parent 0b63512 commit 9b617da

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

configure

Lines changed: 5 additions & 13 deletions
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)