diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2010-07-22 18:57:47 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2010-07-22 18:57:47 +0000 |
| commit | 85cc5d9d3e19a527f230ceab8f6e2f965484aae8 (patch) | |
| tree | 2e4e65c6f911510b794c3e816c62b9078247fcf7 /sys/boot | |
| parent | 19435b2958de4c32a02528cd17ef64f98d2367f8 (diff) | |
| download | FreeBSD-src-85cc5d9d3e19a527f230ceab8f6e2f965484aae8.zip FreeBSD-src-85cc5d9d3e19a527f230ceab8f6e2f965484aae8.tar.gz | |
Correctly setup LDADD with regards to libstand. The submitter points
out that "on amd64, libstand.a is compiled for i386, but is still installed
under ${WORLDTMP}/usr/lib instead of ${WORLDTMP}/usr/lib32. Even if it
would be installed there, ld on amd64 is set up incorrectly with a
${TOOLS_PREFIX}/usr/lib/i386 default path, so it wouldn't link. The reason
it does link under gcc is that gcc passes -L${WORLDTMP}/usr/lib twice,
even for -m32 builds, which is also incorrect, but accidentally works in
this case."
Submitted by: Dimitry Andric <dimitry at andric.com>
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/i386/loader/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 719e28d..71307c0 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -115,7 +115,7 @@ FILES+= loader.rc OBJS= ${BTXCRT} DPADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND} -LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} -lstand +LDADD= ${LIBFICL} ${LIBFIREWIRE} ${LIBZFS} ${LIBI386} ${LIBSTAND} .include <bsd.prog.mk> |
