diff options
| author | Renato Botelho <renato@netgate.com> | 2016-01-07 18:08:08 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-01-07 18:08:08 -0200 |
| commit | 7a579754077b3460c9509c75cdd1b78769c1db3f (patch) | |
| tree | c15015685ccb82b7db1ac19d663a3c6e41e64587 /share | |
| parent | d8ff3484131f428fcc0727cd504acb5050a36490 (diff) | |
| parent | bc6ee646001a22150936ff06bf11cd08195e208d (diff) | |
| download | FreeBSD-src-7a579754077b3460c9509c75cdd1b78769c1db3f.zip FreeBSD-src-7a579754077b3460c9509c75cdd1b78769c1db3f.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'share')
| -rw-r--r-- | share/mk/bsd.compiler.mk | 2 | ||||
| -rw-r--r-- | share/mk/bsd.libnames.mk | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/share/mk/bsd.compiler.mk b/share/mk/bsd.compiler.mk index 511d377..2c62778 100644 --- a/share/mk/bsd.compiler.mk +++ b/share/mk/bsd.compiler.mk @@ -40,7 +40,7 @@ COMPILER_TYPE:= clang . endif .endif .if !defined(COMPILER_VERSION) -COMPILER_VERSION!=echo ${_v:M[1-9].[0-9]*} | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' +COMPILER_VERSION!=echo "${_v:M[1-9].[0-9]*}" | awk -F. '{print $$1 * 10000 + $$2 * 100 + $$3;}' .endif .undef _v .endif diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 6ba1b79..096b08c 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -100,6 +100,7 @@ LIBNCURSES?= ${DESTDIR}${LIBDIR}/libncurses.a LIBNCURSESW?= ${DESTDIR}${LIBDIR}/libncursesw.a LIBNETGRAPH?= ${DESTDIR}${LIBDIR}/libnetgraph.a LIBNGATM?= ${DESTDIR}${LIBDIR}/libngatm.a +LIBNV?= ${DESTDIR}${LIBDIR}/libnv.a LIBNVPAIR?= ${DESTDIR}${LIBDIR}/libnvpair.a LIBOPIE?= ${DESTDIR}${LIBDIR}/libopie.a |
