diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-05-10 14:10:37 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-05-10 14:10:37 +0000 |
| commit | c315376d844afb8153c590fb0b45bd7130e2d0f0 (patch) | |
| tree | 6e2f683292c24bed0f7741bfb4b835868d77171a /solenv/inc/pstrules.mk | |
| parent | d9b84346e048fb62e9e554215b7a2febf1100035 (diff) | |
INTEGRATION: CWS pchfix04 (1.43.10); FILE MERGED
2007/02/13 15:21:09 hjs 1.43.10.4: RESYNC: (1.45-1.46); FILE MERGED
2007/01/26 19:06:47 hjs 1.43.10.3: RESYNC: (1.43-1.45); FILE MERGED
2007/01/04 09:47:58 hjs 1.43.10.2: #i73078# syntax
2007/01/03 11:55:18 hjs 1.43.10.1: #i73078# SECOND_BUILD targets cannot use pch by design (additional defines/switches)
Diffstat (limited to 'solenv/inc/pstrules.mk')
| -rw-r--r-- | solenv/inc/pstrules.mk | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/solenv/inc/pstrules.mk b/solenv/inc/pstrules.mk index bf30727390e5..d847b8c82e36 100644 --- a/solenv/inc/pstrules.mk +++ b/solenv/inc/pstrules.mk @@ -4,9 +4,9 @@ # # $RCSfile: pstrules.mk,v $ # -# $Revision: 1.46 $ +# $Revision: 1.47 $ # -# last change: $Author: vg $ $Date: 2007-02-06 13:56:39 $ +# last change: $Author: kz $ $Date: 2007-05-10 15:10:36 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -87,18 +87,6 @@ $(OBJ)$/$(SECOND_BUILD)_%.obj : %.c $(SLO)$/$(SECOND_BUILD)_%.obj : %.cxx @echo ------------------------------ @echo Making: $@ -.IF "$(ENABLE_PCH)"!="" -# just a helper var - @noop $(assign used_exc_switches=$(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS))) -# cleanup first - @noop $(assign ACT_PCH_SWITCHES:=$(NULL)) -# 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)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches:s/ //)$(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)$(CDEFSSLO)$(CDEFSMT)$(used_exc_switches)$(CFLAGSAPPEND)) $(CFLAGS_USE_PCH) $(NULL))) -.ENDIF # "$(ENABLE_PCH)"!="" .IF "$(GUI)"=="UNX" @$(RM) $@ $(@:s/.obj/.o/) $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSCXXSLO) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ) $(SLO)$/$(SECOND_BUILD)_$*.o $(CFLAGSINCXX)$(PWD)$/$*.cxx @@ -108,7 +96,7 @@ $(SLO)$/$(SECOND_BUILD)_%.obj : %.cxx $(IFEXIST) $(@:s/.obj/.o/) $(THEN) $(TOUCH) $@ $(FI) .ELSE @-$(RM) $@ - $(CXX) $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(ACT_PCH_SWITCHES) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx + $(CXX) @$(mktmp $(CFLAGS) $(INCLUDE) $(CFLAGSCXX) $(CFLAGSSLO) $(CDEFS) $($(SECOND_BUILD)CDEFS) $(CDEFSSLO) $(CDEFSMT) $(!eq,$(EXCEPTIONSFILES),$(subst,$@, $(EXCEPTIONSFILES)) $(LOCAL_EXCEPTIONS_FLAGS) $(GLOBAL_EXCEPTIONS_FLAGS)) $(CFLAGSAPPEND) $(CFLAGSOUTOBJ)$(SLO)$/$(SECOND_BUILD)_$*.obj $(CFLAGSINCXX)$(PWD)$/$*.cxx ) .ENDIF $(SLO)$/$(SECOND_BUILD)_%.obj : %.c |