Fix dylib build on macos. Update version.sh to produce an acceptable version string for Apple Clang to use when building the dylib. BUG=https://bugs.chromium.org/p/aomedia/issues/detail?id=555 Change-Id: I5fb4d348cc56897125708cbd97df6246f65d9187
diff --git a/build/make/version.sh b/build/make/version.sh index c0eef9f..2a7090e 100755 --- a/build/make/version.sh +++ b/build/make/version.sh
@@ -28,13 +28,14 @@ # Source Path is a git working copy. Check for local modifications. # Note that git submodules may have a file as .git, not a directory. export GIT_DIR="${source_path}/.git" - git_version_id=`git describe --match=v[0-9]* 2>/dev/null` + git_version_id=$(git describe --match=v[0-9]* 2>/dev/null) fi changelog_version="" for p in "${source_path}" "${source_path}/.."; do if [ -z "$git_version_id" -a -f "${p}/CHANGELOG" ]; then - changelog_version=`head -n1 "${p}/CHANGELOG" | awk '{print $2}'` + changelog_version=$(grep -m 1 " v[0-9]" "${p}/CHANGELOG" \ + | awk '{print $2}') changelog_version="${changelog_version}" break fi