Mercurial > hg > vamp-build-and-test

changeset 108:080ce3dcdd8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Mon, 07 Sep 2015 14:43:59 +0100
parents e4c146b6e491 (diff) 6920094dd018 (current diff)
children c4758b1b1089
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/SCRIPTS/process.sh	Mon Sep 07 14:42:58 2015 +0100
+++ b/SCRIPTS/process.sh	Mon Sep 07 14:43:59 2015 +0100
@@ -117,7 +117,7 @@
 	bits=64
 	pluginext=.dylib
 	# This is a difficult choice for various reasons... have to ponder
-	archflags="-mmacosx-version-min=10.6 -arch x86_64 -arch i386"
+	archflags="-mmacosx-version-min=10.7 -arch x86_64 -arch i386 -stdlib=libc++"
 	identpattern='Mach-O 64-bit .*x86_64'
 	;;
     *)
@@ -591,7 +591,7 @@
 	    [Ll][Ii][Cc][Ee][Nn][CcSs][Ee]* \
 	    [Cc][Ii][Tt][Aa][Tt][Ii][Oo][Nn]* \
 	    [Cc][Hh][Aa][Nn][Gg][Ee][Ll][Oo][Gg]* \
-	    ../"$pdir"/ || /bin/true
+	    ../"$pdir"/ || true
 	if have_vampy_plugins "$dir"; then
 	    find_vampy_plugins_in "$dir" | while read p; do
 					       cp -av "$p" ../"$pdir"/