Bug 1066669 - Use a regex that OS X sed understands. Fixes configure failures when using --with-ccache=... rs=ted
authorMarkus Stange <mstange@themasta.com>
Fri, 12 Sep 2014 18:31:50 +0200
changeset 205114 a39c5f7e0175572731bea04544058e63d4385b62
parent 205113 75888bec4541a90c21ca011e1b27ce3f9ecfe27e
child 205115 1417bc922c2b75341ab11baac4b5ddb4bda67585
push id27477
push userphilringnalda@gmail.com
push dateSat, 13 Sep 2014 16:45:40 +0000
treeherdermozilla-central@f6a8ea81fa4e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1066669
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1066669 - Use a regex that OS X sed understands. Fixes configure failures when using --with-ccache=... rs=ted
configure.in
--- a/configure.in
+++ b/configure.in
@@ -9132,17 +9132,17 @@ export WRAP_LDFLAGS
 
 if test -n "$_WRAP_MALLOC"; then
     # Avoid doubling wrap malloc arguments
     _SUBDIR_CONFIG_ARGS="`echo $_SUBDIR_CONFIG_ARGS | sed -e 's/--enable-wrap-malloc *//'`"
 fi
 
 if test -n "$MOZ_USING_CCACHE"; then
     # Avoid double prepending ccache by omitting --with-ccache in building NSPR.
-    _SUBDIR_CONFIG_ARGS="`echo $_SUBDIR_CONFIG_ARGS | sed -e 's/--with-ccache\S* *//'`"
+    _SUBDIR_CONFIG_ARGS="`echo $_SUBDIR_CONFIG_ARGS | sed -e 's/--with-ccache[^ ]+//'`"
 fi
 
 MOZ_SUBCONFIGURE_NSPR()
 
 dnl ========================================================
 dnl = Setup a nice relatively clean build environment for
 dnl = sub-configures.
 dnl ========================================================