summaryrefslogtreecommitdiff
path: root/Makeconfig
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-02-26 16:01:06 -0800
committerRoland McGrath <roland@hack.frob.com>2013-02-26 16:01:06 -0800
commit7e80ddb82478e6ad9694b78c441ed00b3d09efa9 (patch)
tree4c3cd2795587b5889611323db750d96ad271b029 /Makeconfig
parent45f058844c33f670475bd02f266942746bcb332b (diff)
Generalize %.v.i rule a bit.
Diffstat (limited to 'Makeconfig')
-rw-r--r--Makeconfig6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makeconfig b/Makeconfig
index 5d86f56514..795edd3bda 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -868,8 +868,6 @@ subdirs = $(sorted-subdirs)
subdir-srcdirs = $(foreach dir,$(subdirs),\
$(firstword $($(dir)-srcdir) $(..)$(dir)))
-ifeq (yes, $(build-shared))
-
# This is a pair of implicit rules to preprocess a file with # comments,
# %ifdef et al, based on config.h settings or other %include'd files.
# We use chained rules instead of a pipeline here so that we can properly
@@ -880,7 +878,7 @@ ifeq (yes, $(build-shared))
# (but no commands).
%.v.i: $(common-objpfx)config.h $(..)Makeconfig
sed '/^[ ]*%/!s/#.*$$//;/^[ ]*$$/d;s/^[ ]*%/#/' \
- $(filter-out FORCE %.h $(..)Makeconfig,$^) \
+ $(filter-out FORCE %.h %.def $(..)Makeconfig,$^) \
| $(CC) -E -undef $(CPPFLAGS) -x assembler-with-cpp - \
> $@T
mv -f $@T $@
@@ -888,6 +886,8 @@ ifeq (yes, $(build-shared))
sed '/^[ ]*#/d;/^[ ]*$$/d' $< > $@T
mv -f $@T $@
+ifeq (yes, $(build-shared))
+
# To generate a header to support more than one ABI for different
# architecture variants, the CPU/Makefile defines abi-variants to be a
# list of names for those variants (e.g. 32 64), and, for each variant,