ldd.host: Fix compilation for STANDALONE support

Signed-off-by: Bernhard Reutner-Fischer <[email protected]>

diff --git a/utils/Makefile.in b/utils/Makefile.in
index cca2c585a2fc83b61dfc4e6b91323e82bcfd8c0f..bb85be3cebe3d417bb80726ef6d013f1efa4a21b 100644 (file)
--- 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 d4ead17d409ca28dcfd75d8c7f580ff61d0a5a5a..f1fdc70aa45211db4fcc5d30eb3d8f3516336440 100644 (file)
--- a/utils/porting.h
+++ b/utils/porting.h
@@ -45,6 +45,10 @@
 #include <dmalloc.h>
 #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