diff options
| author | hp <hp@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-21 00:41:12 +0000 |
|---|---|---|
| committer | hp <hp@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-11-21 00:41:12 +0000 |
| commit | a504f092bed3d889f974ef495ffa599235f786aa (patch) | |
| tree | fae1d7eb79926b1754a393bb15196f0806e31376 | |
| parent | 35c39a015d3858ca229381cf8a3f1eaea465908e (diff) | |
* static-object.mk (c_flags-$o): Save c_flags.
($(base)$(objext)): Use it.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181544 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 9a69320c8b1..dbe5f06645d 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 ab75d3288c3..930f009cd42 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 |