Skip to content

Commit

Permalink
Makefile.libcompat: correctly append to make variable
Browse files Browse the repository at this point in the history 
Reported by:	hselasky
Pointy hat to:	emaste
  • Loading branch information
@emaste
emaste committed Jul 30, 2018
1 parent ad91146 commit 0d84986
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile.libcompat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \
-DLIBRARIES_ONLY

_LC_LIBDIRS.yes= lib
_LC_LIBDIRS.yes= gnu/lib
_LC_LIBDIRS.yes+= gnu/lib
_LC_LIBDIRS.${MK_CDDL:tl}+= cddl/lib
_LC_LIBDIRS.${MK_CRYPT:tl}+= secure/lib
_LC_LIBDIRS.${MK_KERBEROS:tl}+= kerberos5/lib
Expand Down
5 changes: 1 addition & 4 deletions share/mk/src.opts.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,8 @@ __DEFAULT_YES_OPTIONS+=LLVM_LIBUNWIND
.else
__DEFAULT_NO_OPTIONS+=LLVM_LIBUNWIND
.endif
.if ${__T} == "aarch64" || ${__T} == "amd64"
.if ${__T} == "aarch64" || ${__T} == "amd64" || ${__T} == "i386"
__DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
.elif ${__T} == "i386"
__DEFAULT_YES_OPTIONS+=LLD_BOOTSTRAP
__DEFAULT_NO_OPTIONS+=LLD_IS_LD
.else
__DEFAULT_NO_OPTIONS+=LLD_BOOTSTRAP LLD_IS_LD
.endif
Expand Down

0 comments on commit 0d84986

Please sign in to comment.