DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
+
+ifeq "$(TOOLCHAIN)" "1"
+ TARGET = $(DIR_INFO)/$(THISAPP)-tools
+ EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
+else
+ TARGET = $(DIR_INFO)/$(THISAPP)
+ EXTRA_CONFIG = --prefix=/usr
+endif
###############################################################################
# Top-level Rules
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls --docdir=/usr/share/doc/$(THISAPP)
+ cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+ cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
+++ /dev/null
-diff --git a/malloc/hooks.c b/malloc/hooks.c
-index 4398c0a017..2c6cebc889 100644
---- a/malloc/hooks.c
-+++ b/malloc/hooks.c
-@@ -347,11 +347,18 @@ realloc_check (void *oldmem, size_t bytes, const void *caller)
- newmem = _int_realloc (&main_arena, oldp, oldsize, nb);
- }
-
-+ DIAG_PUSH_NEEDS_COMMENT;
-+#if __GNUC_PREREQ (7, 0)
-+ /* GCC 7 warns about magic_p may be used uninitialized. But we never
-+ reach here if magic_p is uninitialized. */
-+ DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
-+#endif
- /* mem2chunk_check changed the magic byte in the old chunk.
- If newmem is NULL, then the old chunk will still be used though,
- so we need to invert that change here. */
- if (newmem == NULL)
- *magic_p ^= 0xFF;
-+ DIAG_POP_NEEDS_COMMENT;
-
- __libc_lock_unlock (main_arena.mutex);
-
\ No newline at end of file