summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2015-05-15 09:26:09 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2015-05-17 08:20:55 +0200
commit6e0e3c3ac0577e77bd22617283633de64fdbf9e5 (patch)
tree4cc18b3afe8f31eceb71c6bcef32d8e21651dcbc
parentb51456e0877e7f8a72602918f7f79b064041488a (diff)
downloadptxdist-6e0e3c3ac0577e77bd22617283633de64fdbf9e5.tar.gz
ptxdist-6e0e3c3ac0577e77bd22617283633de64fdbf9e5.tar.xz
ntpclient: don't install ntpclient if it's not built before
Otherwise ntpclient is built with the wrong cflags during 'make install', which fails with some toolchains. Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/ntpclient.make8
1 files changed, 4 insertions, 4 deletions
diff --git a/rules/ntpclient.make b/rules/ntpclient.make
index 81f8c18ae..a9f47962d 100644
--- a/rules/ntpclient.make
+++ b/rules/ntpclient.make
@@ -32,11 +32,10 @@ NTPCLIENT_DIR := $(BUILDDIR)/$(NTPCLIENT)
NTPCLIENT_PATH := PATH=$(CROSS_PATH)
NTPCLIENT_MAKE_OPT := \
- CC="$(CROSS_CC)" \
- CPPFLAGS='$(CROSS_CPPFLAGS)' \
- LDFLAGS='$(CROSS_LDFLAGS)'
+ CC="$(CROSS_CC)"
NTPCLIENT_CFLAGS :=
+NTPCLIENT_INSTALL_OPT :=
ifdef PTXCONF_NTPCLIENT_BUILD_DEBUG
NTPCLIENT_CFLAGS += -DENABLE_DEBUG
@@ -48,11 +47,12 @@ endif
ifdef PTXCONF_NTPCLIENT_BUILD_NTPCLIENT
NTPCLIENT_MAKE_OPT += ntpclient
+NTPCLIENT_INSTALL_OPT += install
endif
ifdef PTXCONF_NTPCLIENT_BUILD_ADJTIMEX
NTPCLIENT_MAKE_OPT += adjtimex
-NTPCLIENT_INSTALL_OPT := install install_adjtimex
+NTPCLIENT_INSTALL_OPT += install_adjtimex
endif
NTPCLIENT_MAKE_OPT += CFLAGS='-O2 $(NTPCLIENT_CFLAGS)'