From 8579ca1921f038d7e7c1e100709e0a35cf9d1a7d Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 8 May 2012 21:22:51 +0200 Subject: ldd.host: Fix compilation for STANDALONE support Signed-off-by: Bernhard Reutner-Fischer --- utils/Makefile.in | 12 ++++++------ utils/porting.h | 4 ++++ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'utils') diff --git a/utils/Makefile.in b/utils/Makefile.in index cca2c585a..bb85be3ce 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -52,24 +52,24 @@ UTILS_CONFIG_FLAGS-$(LDSO_STANDALONE_SUPPORT) += -D__LDSO_STANDALONE_SUPPORT__ BUILD_CFLAGS-utils := \ -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \ - -DUCLIBC_LDSO=$(UCLIBC_LDSO) \ + -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" \ $(UTILS_CONFIG_FLAGS-y) -BUILD_CFLAGS-ldconfig.host := $(BUILD_CFLAGS-utils) \ +BUILD_CFLAGS-ldconfig.host := \ -DBUILDING_LINKAGE \ -I$(top_srcdir)ldso/include -BUILD_CFLAGS-ldd.host := $(BUILD_CFLAGS-utils) \ +BUILD_CFLAGS-ldd.host := \ -DBUILDING_LINKAGE \ -I$(top_srcdir)ldso/include \ -include $(top_srcdir)include/elf.h -BUILD_CFLAGS-locale.host := $(BUILD_CFLAGS-utils) \ +BUILD_CFLAGS-locale.host := \ -DNOT_IN_libc \ -I$(top_srcdir)utils/ \ -I. -BUILD_CFLAGS-iconv.host := $(BUILD_CFLAGS-utils) \ +BUILD_CFLAGS-iconv.host := \ -include $(top_builddir)extra/locale/c8tables.h \ -I$(top_srcdir)libc/misc/wchar -DL_iconv_main -BUILD_CFLAGS-getconf.host := $(BUILD_CFLAGS-utils) \ +BUILD_CFLAGS-getconf.host := \ -DGETCONF_DIR='"$(CURDIR)"' # Rules diff --git a/utils/porting.h b/utils/porting.h index d4ead17d4..f1fdc70aa 100644 --- a/utils/porting.h +++ b/utils/porting.h @@ -45,6 +45,10 @@ #include #endif +#ifndef ARRAY_SIZE +# define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) +#endif + /* For SunOS */ #ifndef PATH_MAX #define PATH_MAX _POSIX_PATH_MAX -- cgit v1.2.3