diff options
| author | Oliver Bolte <obo@openoffice.org> | 2009-02-19 07:29:28 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2009-02-19 07:29:28 +0000 |
| commit | 3e408852075dff84a6fd998a9acba3c422603da4 (patch) | |
| tree | a916913398b7b8f65f5a414040e1f592294425b6 /solenv/inc/rules.mk | |
| parent | 641c2d4883d3bc64ef80e4ac4e9631608befe934 (diff) | |
CWS-TOOLING: integrate CWS ause099
2009-01-29 12:30:57 +0100 hjs r267116 : #i98365# fix unsetting g+s bit
2009-01-23 14:21:19 +0100 hjs r266819 : #i40246# - cleanup
2009-01-23 14:14:07 +0100 hjs r266818 : #i40246# - fix quoting of final echo line
2009-01-23 12:42:33 +0100 hjs r266807 : #i98365# leave higher bits alone
2009-01-23 11:23:42 +0100 rt r266799 : Header
2009-01-22 19:14:25 +0100 hjs r266753 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:22:18 +0100 hjs r266737 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:20:54 +0100 hjs r266736 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:20:24 +0100 hjs r266735 : #i98365# remove unwanted file attributes from archives
2009-01-22 16:08:33 +0100 hjs r266734 : #i40246# renamed variable
2009-01-22 16:05:26 +0100 hjs r266733 : #i40246# renamed variable
2009-01-20 17:46:54 +0100 hjs r266610 : #i98290# cleanup
2009-01-19 19:32:19 +0100 hjs r266522 : CWS-TOOLING: rebase CWS ause099 to trunk@266428 (milestone: DEV300:m39)
2008-12-08 21:00:09 +0100 hjs r265049 : CWS-TOOLING: rebase CWS ause099 to trunk@264807 (milestone: DEV300:m37)
2008-11-27 18:25:18 +0100 hjs r264513 : #i40246# - support multiple patches per archive
2008-11-17 19:00:12 +0100 hjs r263738 : CWS-TOOLING: rebase CWS ause099 to trunk@263288 (milestone: DEV300:m35)
Diffstat (limited to 'solenv/inc/rules.mk')
| -rw-r--r-- | solenv/inc/rules.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/inc/rules.mk b/solenv/inc/rules.mk index 1287cc3d859d..87dc225cd7d0 100644 --- a/solenv/inc/rules.mk +++ b/solenv/inc/rules.mk @@ -155,7 +155,7 @@ $(SLO)$/precompiled_ex.% .PHONY: .ELSE # "$(COM)"=="MSC" $(TOUCH) $(SLO)$/pch_ex$/precompiled_$(PRJNAME).hxx$(PCHPOST) .ENDIF # "$(COM)"=="MSC" - @echo USED_EXCEPTIONS_PCHFLAGS=$(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)$/pch_ex.mk + @echo USED_EXCEPTIONS_PCHFLAGS=$(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS)$(CDEFSSLO)$(CDEFSMT)$(CFLAGSEXCEPTIONS) -DEXCEPTIONS_ON$(CFLAGSAPPEND)> $(INCCOM)$/pch_ex.mk .INCLUDE .IGNORE : $(INCCOM)$/pch.mk .INCLUDE .IGNORE : $(INCCOM)$/pch_ex.mk @@ -172,9 +172,9 @@ $(SLO)$/%.obj : %.cxx # eq: first string is a copy of the compile line, # second generated by pch creation # use pch with exception support - @noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_EXCEPTIONS_PCHFLAGS)),$(strip $(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_EXCEPTIONS_PCH) $(NULL))) + @noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_EXCEPTIONS_PCHFLAGS)),$(strip $(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_EXCEPTIONS_PCH) $(NULL))) # use pch without exception support - @noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_PCHFLAGS)),$(strip $(CFLAGS)$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_PCH) $(NULL))) + @noop $(assign ACT_PCH_SWITCHES+=$(eq,$(strip $(USED_PCHFLAGS)),$(strip $(subst,$(CFLAGSDEBUG), $(CFLAGS))$(CFLAGSCXX)$(CFLAGSCXXSLO)$(CFLAGSSLO)$(CDEFS:s/\//)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_PCH) $(NULL))) .ENDIF # "$(ENABLE_PCH)"!="" .IF "$(GUI)"=="UNX" .IF "$(TEST)"!="" |