summaryrefslogtreecommitdiffstats
path: root/rules/canfestival.make
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2018-04-24 10:37:34 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2018-04-24 10:37:36 +0200
commitf9ba8eb6e9054aa2828041afca8287765492e139 (patch)
treeebe3ab3faf165854ad7649e786fcca7bdb085b2c /rules/canfestival.make
parente8216c5837d22368d8e570b14c71516f5877d2b5 (diff)
downloadptxdist-f9ba8eb6e9054aa2828041afca8287765492e139.tar.gz
ptxdist-f9ba8eb6e9054aa2828041afca8287765492e139.tar.xz
canfestival: cleanup rules
- don't select KERNEL_HEADER and only try to use them if they are enabled - use the default environment and force the linker via configure option Otherwise, plain ld is used which results in undefined references. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules/canfestival.make')
-rw-r--r--rules/canfestival.make10
1 files changed, 5 insertions, 5 deletions
diff --git a/rules/canfestival.make b/rules/canfestival.make
index 80fdbec6a..ab8bab456 100644
--- a/rules/canfestival.make
+++ b/rules/canfestival.make
@@ -32,22 +32,22 @@ CANFESTIVAL_DIR := $(BUILDDIR)/$(CANFESTIVAL)
# Prepare
# ----------------------------------------------------------------------------
-CANFESTIVAL_PATH := PATH=$(CROSS_PATH)
-CANFESTIVAL_ENV := $(CROSS_ENV_CC)
-# Overwrite OPT_CFLAGS instead of CFLAGS so we don't loose other flags
-# such as -fPIC for libs. Note this breaks when using "--disable-Ox"
-CANFESTIVAL_MAKEVARS := OPT_CFLAGS="-isystem $(KERNEL_HEADERS_INCLUDE_DIR) -O2"
#
# autoconf
#
CANFESTIVAL_CONF_TOOL := autoconf
CANFESTIVAL_CONF_OPT := \
+ --ld=$(CROSS_CXX) \
--prefix=/usr \
--can=socket \
--timers=unix \
--wx=0 \
$(call ptx/ifdef,PTXCONF_ENDIAN_BIG,--CANOPEN_BIG_ENDIAN=1) \
+ifdef PTXCONF_KERNEL_HEADER
+CANFESTIVAL_CFLAGS := -isystem $(KERNEL_HEADERS_INCLUDE_DIR)
+endif
+
# ----------------------------------------------------------------------------
# Install
# ----------------------------------------------------------------------------