From 75e35d3a603a7c5fb0366b4e4ef1c20b05c0d4fc Mon Sep 17 00:00:00 2001 From: John Marino Date: Sat, 2 Feb 2013 23:35:27 +0100 Subject: [PATCH] Unbreak world (gcc47 plugin) The installincludes target is run before "depend" target, so gtype.state hasn't been created by the time "installincludes" is executed in stage 4. Luckily there is a similar functionality for FILES that is executed at the install phase, which will unbreak world (broken on previous commit). Other headers are generated as well, so swap INCSGROUPS with FILESGROUPS for everything to avoid having to figure which ones. The headers are needed at runtime, not buildtime, so this is okay. --- gnu/usr.bin/cc47/liblto_plugin/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/usr.bin/cc47/liblto_plugin/Makefile b/gnu/usr.bin/cc47/liblto_plugin/Makefile index 5ba62dde2e..e0f1461267 100644 --- a/gnu/usr.bin/cc47/liblto_plugin/Makefile +++ b/gnu/usr.bin/cc47/liblto_plugin/Makefile @@ -40,14 +40,14 @@ SRCS+= hashtab.c \ make-temp-file.c \ concat.c -INCSGROUPS+= LVL1_ LVL2_ LVL2_1_ LVL2_2_ LVL2_3_ LVL2_4_ LVL2_5_ +FILESGROUPS+= LVL1_ LVL2_ LVL2_1_ LVL2_2_ LVL2_3_ LVL2_4_ LVL3_ LVL1_DIR= ${PLUGIN_RESOURCE_DIR} LVL2_DIR= ${PLUGIN_HEADER_DIR} LVL2_1_DIR= ${PLUGIN_HEADER_DIR}/c-family LVL2_2_DIR= ${PLUGIN_HEADER_DIR}/cp LVL2_3_DIR= ${PLUGIN_HEADER_DIR}/objc LVL2_4_DIR= ${PLUGIN_HEADER_DIR}/config -LVL2_5_DIR= ${PLUGIN_HEADER_DIR}/config/i386 +LVL3_DIR= ${PLUGIN_HEADER_DIR}/config/i386 LVL1_= ${.OBJDIR}/../cc_tools/tools/gtype.state LVL2_= ${PLUGIN_HEADERS} @@ -55,6 +55,6 @@ LVL2_1_= ${PLUGIN_HEADERS_CFAMILY} LVL2_2_= ${PLUGIN_HEADERS_CP} LVL2_3_= ${PLUGIN_HEADERS_OBJC} LVL2_4_= ${PLUGIN_HEADERS_CONFIG} -LVL2_5_= ${PLUGIN_HEADERS_CONFIG_I386} +LVL3_= ${PLUGIN_HEADERS_CONFIG_I386} .include -- 2.41.0