summaryrefslogtreecommitdiff
path: root/cross
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2014-09-19 08:30:52 +0000
committerjoerg <joerg@pkgsrc.org>2014-09-19 08:30:52 +0000
commit31b1658cf03f7eb1f628377e21f01995dd4826fc (patch)
tree63cd92df21dba1b4d988c2634860035a526d07b6 /cross
parenteb8e058156bcb12a66b1e12edf7090393f51f3d5 (diff)
downloadpkgsrc-31b1658cf03f7eb1f628377e21f01995dd4826fc.tar.gz
Reset CFLAGS/CXXFLAGS at the end and add CPPFLAGS to the list.
Fixes build on NetBSD where native unwind.h is picked up otherwise.
Diffstat (limited to 'cross')
-rw-r--r--cross/avr-gcc/Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index 0add1155809..09f72942580 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2014/08/29 04:26:46 mef Exp $
+# $NetBSD: Makefile,v 1.36 2014/09/19 08:30:52 joerg Exp $
DISTNAME= gcc-4.8.3
PKGNAME= ${DISTNAME:C/^/avr-/}
@@ -31,12 +31,9 @@ CONFIGURE_ARGS+= --disable-threads
MAKE_ENV+= MACHINE_ARCH=avr
MAKE_ENV+= SHELL=${CONFIG_SHELL}
-CFLAGS_FOR_BUILD:= ${CFLAGS}
MAKE_ENV+= CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD:Q}
-CXXFLAGS_FOR_BUILD:= ${CXXFLAGS}
MAKE_ENV+= CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD:Q}
-CFLAGS= # empty
-CXXFLAGS= # empty
+MAKE_ENV+= CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD:Q}
SUBST_CLASSES+= sed
SUBST_FILES.sed= fixincludes/fixincl.x
@@ -63,3 +60,10 @@ INSTALLATION_DIRS+= avr/bin
# mpc is required since gcc-4.5.x
.include "../../math/mpcomplex/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
+
+CFLAGS_FOR_BUILD:= ${CFLAGS}
+CXXFLAGS_FOR_BUILD:= ${CXXFLAGS}
+CPPFLAGS_FOR_BUILD:= ${CPPFLAGS}
+CFLAGS:= # empty
+CPPFLAGS:= # empty
+CXXFLAGS:= # empty