diff options
| author | Hans-Peter Nilsson <hp@axis.com> | 2011-11-21 00:41:12 +0000 |
|---|---|---|
| committer | Hans-Peter Nilsson <hp@gcc.gnu.org> | 2011-11-21 00:41:12 +0000 |
| commit | 0115d17f1600133128c5c3eed87e89408242a2d3 (patch) | |
| tree | fae1d7eb79926b1754a393bb15196f0806e31376 | |
| parent | a0a49ff5a37a8f7de24ceb744c30a34cda1c9681 (diff) | |
| download | gcc-0115d17f1600133128c5c3eed87e89408242a2d3.zip gcc-0115d17f1600133128c5c3eed87e89408242a2d3.tar.gz gcc-0115d17f1600133128c5c3eed87e89408242a2d3.tar.bz2 | |
static-object.mk (c_flags-$o): Save c_flags.
* static-object.mk (c_flags-$o): Save c_flags.
($(base)$(objext)): Use it.
From-SVN: r181544
| -rw-r--r-- | libgcc/ChangeLog | 5 | ||||
| -rw-r--r-- | libgcc/static-object.mk | 7 |
2 files changed, 11 insertions, 1 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 9a69320..dbe5f06 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2011-11-20 Hans-Peter Nilsson <hp@axis.com> + + * static-object.mk (c_flags-$o): Save c_flags. + ($(base)$(objext)): Use it. + 2011-11-18 Steve Ellcey <sje@cup.hp.com> * Makefile.in (c_flags): Set to -fno-exceptions to build libunwind. diff --git a/libgcc/static-object.mk b/libgcc/static-object.mk index ab75d32..930f009 100644 --- a/libgcc/static-object.mk +++ b/libgcc/static-object.mk @@ -6,10 +6,15 @@ iter-items := $(filter-out $o,$(iter-items)) base := $(basename $(notdir $o)) +# Copy c_flags to a rule-specific copy and use the copy, to avoid the +# following rules being affected by later changes to c_flags in the +# including file. +c_flags-$o := $(c_flags) + ifeq ($(suffix $o),.c) $(base)$(objext): $o - $(gcc_compile) $(c_flags) -c $< $(vis_hide) + $(gcc_compile) $(c_flags-$<) -c $< $(vis_hide) else |