svn commit: r358296 - projects/clang1000-import/share/mk
Dimitry Andric
dim at FreeBSD.org
Mon Feb 24 19:11:53 UTC 2020
Author: dim
Date: Mon Feb 24 19:11:52 2020
New Revision: 358296
URL: https://svnweb.freebsd.org/changeset/base/358296
Log:
Adjust the regex used for LINKER_FREEBSD_VERSION so it captures the last
dash-separated segment from the upstream commit description. This is
required to parse "git describe --long" output.
Modified:
projects/clang1000-import/share/mk/bsd.linker.mk
Modified: projects/clang1000-import/share/mk/bsd.linker.mk
==============================================================================
--- projects/clang1000-import/share/mk/bsd.linker.mk Mon Feb 24 19:02:41 2020 (r358295)
+++ projects/clang1000-import/share/mk/bsd.linker.mk Mon Feb 24 19:11:52 2020 (r358296)
@@ -70,7 +70,7 @@ _v= ${_ld_version:M[1-9]*.[0-9]*:[1]}
${X_}LINKER_TYPE= lld
_v= ${_ld_version:[2]}
.if ${_ld_version:[3]} == "(FreeBSD"
-${X_}LINKER_FREEBSD_VERSION:= ${_ld_version:[4]:C/.*-(.*)\)/\1/}
+${X_}LINKER_FREEBSD_VERSION:= ${_ld_version:[4]:C/.*-([^-]*)\)/\1/}
.else
${X_}LINKER_FREEBSD_VERSION= 0
.endif
More information about the svn-src-projects
mailing list