about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-02-14 07:10:52 +0000
committerbors <bors@rust-lang.org>2015-02-14 07:10:52 +0000
commit95b228ab95902cf7bfa025ca918b42d94053df84 (patch)
treef58bd284e383fc1824a628655ed618bf5829c1f1
parentf174bcabcb8c9c707481c834766894d984eb089f (diff)
parent04b7976c2f069335483455de396ba2579b0305e2 (diff)
downloadrust-95b228ab95902cf7bfa025ca918b42d94053df84.tar.gz
rust-95b228ab95902cf7bfa025ca918b42d94053df84.zip
Auto merge of #22041 - semarie:configure-compat, r=alexcrichton
the sed option `--in-place` (or `-i`) is a GNU extension, and it is not
portable to BSD system (openbsd and freebsd checked).

use an alternate construction in order to keep the semantic.
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index e6b8d235448..ec1e741fb9c 100755
--- a/configure
+++ b/configure
@@ -1379,7 +1379,8 @@ do
 done
 
 # Munge any paths that appear in config.mk back to posix-y
-sed -i.bak -e 's@ \([a-zA-Z]\):[/\\]@ /\1/@g;' config.tmp
+cp config.tmp config.tmp.bak
+sed -e 's@ \([a-zA-Z]\):[/\\]@ /\1/@g;' <config.tmp.bak >config.tmp
 rm -f config.tmp.bak
 
 msg