diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2018-07-30 14:42:59 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2018-07-30 14:42:59 +0000 |
| commit | 0d84986542c3289325f1fb6017b76dfcdaa92f3d (patch) | |
| tree | 4c15a9556bb590ca0e3e247541e0ee72ae68f708 | |
| parent | ad91146c666d43473631c5155bdb598b322f2f94 (diff) | |
Notes
| -rw-r--r-- | Makefile.libcompat | 2 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Makefile.libcompat b/Makefile.libcompat index f3186ee4c79f..d038e4f42162 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -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 diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 60d0487d3d4d..706edd7ede74 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -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 |