aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2015-01-23 02:52:26 +0800
committerjbeich <jbeich@FreeBSD.org>2015-01-23 02:52:26 +0800
commit633c6ce34cd8f27622c1922b72cb9b13ef47fb67 (patch)
tree5637f82151d83dec86d6995c0795aa83f8bb9b68
parent6ba2c007bb76ca354b44fc8f5b0e4ba42d90c011 (diff)
downloadfreebsd-ports-graphics-633c6ce34cd8f27622c1922b72cb9b13ef47fb67.tar.gz
freebsd-ports-graphics-633c6ce34cd8f27622c1922b72cb9b13ef47fb67.tar.zst
freebsd-ports-graphics-633c6ce34cd8f27622c1922b72cb9b13ef47fb67.zip
Pass CFLAGS and LDFLAGS by default to scons build, again
This fixes r355494 regression. PR: 193434 Differential Revision: https://reviews.freebsd.org/D1602 Reviewed by: bapt Approved by: bapt (mentor) Approved by: portmgr (bapt)
-rw-r--r--Mk/Uses/scons.mk2
-rw-r--r--audio/csound/Makefile1
2 files changed, 3 insertions, 0 deletions
diff --git a/Mk/Uses/scons.mk b/Mk/Uses/scons.mk
index 3866cb823bd..59a9201ad38 100644
--- a/Mk/Uses/scons.mk
+++ b/Mk/Uses/scons.mk
@@ -17,6 +17,8 @@ IGNORE= Incorrect 'USES+= scons:${scons_ARGS}' scons takes no arguments
MAKEFILE= #
MAKE_FLAGS= #
ALL_TARGET= #
+CCFLAGS?= ${CFLAGS}
+LINKFLAGS?= ${LDFLAGS}
LIBPATH?= ${LOCALBASE}/lib
CPPPATH?= ${LOCALBASE}/include
SCONS= ${LOCALBASE}/bin/scons
diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index 5f2c94d3760..da696bdbec9 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -52,6 +52,7 @@ SSP_UNSAFE= yes
CFLAGS+= -fPIC -fopenmp -DUSE_OPENMP
LDFLAGS+= -pthread -Wl,-export-dynamic
+LINKFLAGS= # empty
SUB_FILES= pkg-message