Don't compile bin/cbordump in freestanding builds

Signed-off-by: Thiago Macieira <[email protected]>

Author: thiagomacieira

Makefile

@@ -8,7 +8,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 
 CFLAGS = -Wall -Wextra
 LDFLAGS_GCSECTIONS = -Wl,--gc-sections
-LDFLAGS = $(if $(gc_sections-pass),$(LDFLAGS_GCSECTIONS))
+LDFLAGS += $(if $(gc_sections-pass),$(LDFLAGS_GCSECTIONS))
 
 GIT_ARCHIVE = git archive --prefix="$(PACKAGE)/" -9
 INSTALL = install
@@ -28,13 +28,6 @@ TINYCBOR_FREESTANDING_SOURCES = \
 	src/cborparser.c \
 	src/cborpretty.c \
 #
-TINYCBOR_SOURCES = \
-	$(TINYCBOR_FREESTANDING_SOURCES) \
-	src/cborparser_dup_string.c \
-	src/cborpretty_stdio.c \
-	src/cbortojson.c \
-	src/cborvalidation.c \
-#
 CBORDUMP_SOURCES = tools/cbordump/cbordump.c
 
 BUILD_SHARED = $(shell file -L /bin/sh 2>/dev/null | grep -q ELF && echo 1)
@@ -87,6 +80,16 @@ endif
 
 -include .config
 
+ifeq ($(freestanding-pass),1)
+TINYCBOR_SOURCES = $(TINYCBOR_FREESTANDING_SOURCES)
+else
+TINYCBOR_SOURCES = \
+	$(TINYCBOR_FREESTANDING_SOURCES) \
+	src/cborparser_dup_string.c \
+	src/cborpretty_stdio.c \
+	src/cbortojson.c \
+	src/cborvalidation.c \
+#
 # if open_memstream is unavailable on the system, try to implement our own
 # version using funopen or fopencookie
 ifeq ($(open_memstream-pass),)
@@ -97,6 +100,7 @@ ifeq ($(open_memstream-pass),)
     TINYCBOR_SOURCES += src/open_memstream.c
   endif
 endif
+endif
 
 # json2cbor depends on an external library (cjson)
 ifneq ($(cjson-pass)$(system-cjson-pass),)
@@ -114,7 +118,8 @@ endif
 all: .config \
 	$(if $(subst 0,,$(BUILD_STATIC)),lib/libtinycbor.a) \
 	$(if $(subst 0,,$(BUILD_SHARED)),lib/libtinycbor.so) \
-	bin/cbordump tinycbor.pc
+	$(if $(freestanding-pass),,bin/cbordump) \
+	tinycbor.pc
 all: $(if $(JSON2CBOR_SOURCES),bin/json2cbor)
 check: tests/Makefile | $(BINLIBRARY)
 	$(MAKE) -C tests check

Makefile.configure

@@ -1,5 +1,5 @@
 ALLTESTS = open_memstream funopen fopencookie gc_sections \
-	   system-cjson cjson
+	   system-cjson cjson freestanding
 MAKEFILE := $(lastword $(MAKEFILE_LIST))
 OUT :=
 
@@ -8,6 +8,11 @@ PROGRAM-funopen = extern int funopen(); int main() { return funopen(); }
 PROGRAM-fopencookie = extern int fopencookie(); int main() { return fopencookie(); }
 PROGRAM-gc_sections = int main() {}
 CCFLAGS-gc_sections = -Wl,--gc-sections
+PROGRAM-freestanding  = \#if !defined(__STDC_HOSTED__) || __STDC_HOSTED__-0 == 1\n
+PROGRAM-freestanding += \#error Hosted implementation\n
+PROGRAM-freestanding += \#endif\n
+PROGRAM-freestanding += int main() {}
+CCFLAGS-freestanding = $(CFLAGS)
 
 PROGRAM-cjson  = \#include <stdlib.h>\n
 PROGRAM-cjson += \#include <cjson/cJSON.h>\n