From 8b37637b7fd8a0af74d68d5f29c12ac285ef0e07 Mon Sep 17 00:00:00 2001 From: Charles Davis Date: Tue, 28 Feb 2012 02:55:41 +0000 Subject: [PATCH] Strip extraneous information, if present, from the linker version string on Mac OS X. Patch by Fabian Groffen, with a slight tweak by me. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151612 91177308-0d34-0410-b5e6-96231b3b80d8 --- autoconf/m4/link_options.m4 | 2 +- configure | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autoconf/m4/link_options.m4 b/autoconf/m4/link_options.m4 index 4c5f2f435d0..57da4a0d926 100644 --- a/autoconf/m4/link_options.m4 +++ b/autoconf/m4/link_options.m4 @@ -10,7 +10,7 @@ AC_DEFUN([AC_LINK_GET_VERSION], # Check for ld64. if (echo "$version_string" | grep -q "ld64"); then - llvm_cv_link_version=$(echo "$version_string" | sed -e "s#.*ld64-\([^ ]*\)#\1#") + llvm_cv_link_version=$(echo "$version_string" | sed -e "s#.*ld64-\([^ ]*\)\( (.*)\)\{0,1\}#\1#") else llvm_cv_link_version=$(echo "$version_string" | sed -e "s#[^0-9]*\([0-9.]*\).*#\1#") fi diff --git a/configure b/configure index 6cd0db88700..848972866e6 100755 --- a/configure +++ b/configure @@ -7783,7 +7783,7 @@ else # Check for ld64. if (echo "$version_string" | grep -q "ld64"); then - llvm_cv_link_version=$(echo "$version_string" | sed -e "s#.*ld64-\([^ ]*\)#\1#") + llvm_cv_link_version=$(echo "$version_string" | sed -e "s#.*ld64-\([^ ]*\)\( (.*)\)\{0,1\}#\1#") else llvm_cv_link_version=$(echo "$version_string" | sed -e "s#[^0-9]*\([0-9.]*\).*#\1#") fi