diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1862,7 +1862,7 @@ . endif .endif -.if defined(USE_BINUTILS) && !defined(DISABLE_BINUTILS) +.if defined(USE_BINUTILS) BUILD_DEPENDS+= ${LOCALBASE}/bin/as:devel/binutils BINUTILS?= ADDR2LINE AR AS CPPFILT GPROF LD NM OBJCOPY OBJDUMP RANLIB \ READELF SIZE STRINGS @@ -1878,6 +1878,16 @@ . endfor .endif +.if !defined(CROSS_TOOLCHAIN) && !defined(USE_BINUTILS) +SYSMK_TOOLCHAIN+= AR="${AR}" AS="${AS}" NM="${NM}" OBJCOPY="${OBJCOPY}" \ + OBJDUMP="${OBJDUMP}" RANLIB="${RANLIB}" READELF="${READELF}" \ + SIZE="${SIZE}" STRINGS="${STRINGS}" STRIPBIN="${STRIP_CMD}" +.endif +# XXX: CC, CPP, CXX once CROSS_TOOLCHAIN is converted +.if !defined(CROSS_TOOLCHAIN) +SYSMK_TOOLCHAIN+= OBJC="${OBJC}" +.endif + .if defined(USE_OPENLDAP) || defined(WANT_OPENLDAP_VER) .include "${PORTSDIR}/Mk/bsd.ldap.mk" .endif @@ -2041,7 +2051,8 @@ CPP="${CPP}" CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ - MANPREFIX="${MANPREFIX}" + MANPREFIX="${MANPREFIX}" \ + ${SYSMK_TOOLCHAIN} # Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher. # gcc 4.x enable strict aliasing optimization with -O2 which is known to break @@ -3261,7 +3272,7 @@ @${MKDIR} ${CONFIGURE_WRKSRC} @(cd ${CONFIGURE_WRKSRC} && \ ${SET_LATE_CONFIGURE_ARGS} \ - if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ + if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" ${SYSMK_TOOLCHAIN} \ CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" LIBS="${LIBS}" \ INSTALL="/usr/bin/install -c" \