Actually fix build with gcc46 when bsd.gcc.mk passes LDFLAGS with -Wl,...

This commit is contained in:
Juergen Lock 2013-06-27 21:45:00 +00:00
parent 620c08561a
commit 28dd2f0c7f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=321908
2 changed files with 12 additions and 6 deletions

View file

@ -40,8 +40,11 @@ PLIST_FILES+= "@cwd"
MAKEFILE= Makefile.freebsd
MAKE_ARGS+= LDFLAGS=${LDFLAGS:S/^-Wl,//}
MAKE_ARGS+= CWARNFLAGS=-Wall
.if ${ARCH} == "amd64"
MAKE_ARGS+= ARCH=x86_64
GMAKE_ARGS+= ARCH=x86_64
.endif
# install where x11/nvidia-driver does also:
@ -72,8 +75,8 @@ post-patch:
do-build:
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} beforedepend && ${LN} -sfh @/sys sys)
@(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} ${ALL_TARGET})
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} CWARNFLAGS=-Wall ${ALL_TARGET})
@(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${GMAKE_ARGS} ${ALL_TARGET})
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
do-install:
@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})

View file

@ -40,8 +40,11 @@ PLIST_FILES+= "@cwd"
MAKEFILE= Makefile.freebsd
MAKE_ARGS+= LDFLAGS=${LDFLAGS:S/^-Wl,//}
MAKE_ARGS+= CWARNFLAGS=-Wall
.if ${ARCH} == "amd64"
MAKE_ARGS+= ARCH=x86_64
GMAKE_ARGS+= ARCH=x86_64
.endif
# install where x11/nvidia-driver does also:
@ -63,8 +66,8 @@ post-patch:
do-build:
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} beforedepend && ${LN} -sfh @/sys sys)
@(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} ${ALL_TARGET})
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} CWARNFLAGS=-Wall ${ALL_TARGET})
@(cd ${BUILD_WRKSRC}/common; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile ${GMAKE_ARGS} ${ALL_TARGET})
@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
do-install:
@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET})