summaryrefslogtreecommitdiff
path: root/devel/cpuflags/files/cpuflags.mk
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2002-01-03 11:54:47 +0000
committerabs <abs@pkgsrc.org>2002-01-03 11:54:47 +0000
commitcc8fc92d23da5023e986c6b6e04540a7c0f8c31e (patch)
tree2aa13608042d18598c87b657e69ee686e857e698 /devel/cpuflags/files/cpuflags.mk
parent2baa02b807c0ba7f3611a0a328840780bbb1b7ab (diff)
downloadpkgsrc-cc8fc92d23da5023e986c6b6e04540a7c0f8c31e.tar.gz
Updated cpuflags to 0.17
Update MAKE_FLAGS so we can affect imake using packages
Diffstat (limited to 'devel/cpuflags/files/cpuflags.mk')
-rw-r--r--devel/cpuflags/files/cpuflags.mk13
1 files changed, 9 insertions, 4 deletions
diff --git a/devel/cpuflags/files/cpuflags.mk b/devel/cpuflags/files/cpuflags.mk
index d332b4a0edb..2b3aaa37b98 100644
--- a/devel/cpuflags/files/cpuflags.mk
+++ b/devel/cpuflags/files/cpuflags.mk
@@ -1,9 +1,9 @@
-# $Id: cpuflags.mk,v 1.2 2001/12/24 13:25:47 abs Exp $
+# $Id: cpuflags.mk,v 1.3 2002/01/03 11:54:47 abs Exp $
# Makefile include fragment to simplify use of cpuflags in pkgsrc
# abs@netbsd.org - freely distributable, no warrenties, stick no bills.
# Try to optimise based on CPU
-# Does not affect Imakefiles, and any package that overrides CFLAGS/CXXFLAGS
+# Does not affect any package that overrides CFLAGS/CXXFLAGS/CCOPTIONS
# Sets five variables:
#
# CPU_FLAGS The output of cpuflags
@@ -12,13 +12,18 @@
#
# CPU_DIR CPU_FLAGS with spaces stripped (eg: for use in PACKAGES)
# LOWER_CPU_DIR As CPU_FLAGS but all lower case
-#
+
.if ! defined(CPU_FLAGS)
CPU_FLAGS!=/usr/pkg/bin/cpuflags
CPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //'
LOWER_CPU_DIR!=echo ${CPU_DIR} | tr A-Z a-z
-MAKE_ENV+=CPU_FLAGS=${CPU_FLAGS} CPU_DIR=${CPU_DIR}
CFLAGS+=${CPU_FLAGS}
CXXFLAGS+=${CPU_FLAGS}
+
+# Make the flags available to make
+MAKE_ENV+=CPU_FLAGS=${CPU_FLAGS} CPU_DIR=${CPU_DIR}
+
+# Override CCOPTIONS for imake
+MAKE_FLAGS+=CCOPTIONS=${CPU_FLAGS}
.endif