diff options
| author | nox <nox@FreeBSD.org> | 2013-06-28 05:45:00 +0800 |
|---|---|---|
| committer | nox <nox@FreeBSD.org> | 2013-06-28 05:45:00 +0800 |
| commit | d165a74a45464a9d275777d8e67ca1ba9dcc0d29 (patch) | |
| tree | bc85f57fa0df42559782a836cec8790cd249483b /emulators | |
| parent | 729ace24250630167ab45af3d3ee6cfbb8141bcc (diff) | |
| download | freebsd-ports-gnome-d165a74a45464a9d275777d8e67ca1ba9dcc0d29.tar.gz freebsd-ports-gnome-d165a74a45464a9d275777d8e67ca1ba9dcc0d29.tar.zst freebsd-ports-gnome-d165a74a45464a9d275777d8e67ca1ba9dcc0d29.zip | |
Actually fix build with gcc46 when bsd.gcc.mk passes LDFLAGS with -Wl,...
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/kqemu-kmod-devel/Makefile | 9 | ||||
| -rw-r--r-- | emulators/kqemu-kmod/Makefile | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/emulators/kqemu-kmod-devel/Makefile b/emulators/kqemu-kmod-devel/Makefile index 359b1508c590..181dde346e7d 100644 --- a/emulators/kqemu-kmod-devel/Makefile +++ b/emulators/kqemu-kmod-devel/Makefile @@ -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}) diff --git a/emulators/kqemu-kmod/Makefile b/emulators/kqemu-kmod/Makefile index 48929f93ccdf..7d9c5aad4ee1 100644 --- a/emulators/kqemu-kmod/Makefile +++ b/emulators/kqemu-kmod/Makefile @@ -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}) |