(file) Return to objects-unix.mak CVS log (file) (dir) Up to [Pegasus] / pegasus / mak

Diff for /pegasus/mak/objects-unix.mak between version 1.13 and 1.15

version 1.13, 2005/05/12 15:27:28 version 1.15, 2006/01/25 20:50:30
Line 37 
Line 37 
 ################################################################################ ################################################################################
  
 ifeq ($(findstring _GNU, $(PEGASUS_PLATFORM)), _GNU) ifeq ($(findstring _GNU, $(PEGASUS_PLATFORM)), _GNU)
 GCC_VERSION=$(word 3, $(shell $(CXX) --version))  
 ifneq ($(GCC_VERSION), 2.9.5) ifneq ($(GCC_VERSION), 2.9.5)
     _NO_TMP_O=yes     _NO_TMP_O=yes
 endif endif
Line 75 
Line 74 
         @ $(TOUCH) $@         @ $(TOUCH) $@
         @ $(ECHO)         @ $(ECHO)
 endif endif
   
   ifeq ($(_NO_TMP_O), yes)
   $(OBJ_DIR)/%.o: %.s $(ERROR)
           $(CC) -c -o $@ $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.s
           @ $(TOUCH) $@
           @ $(ECHO)
   else
   $(OBJ_DIR)/%.o: %.s $(ERROR)
           $(CC) -c -o $(_TMP_O) $(FLAGS) $(EXTRA_C_FLAGS) $(LOCAL_DEFINES) $(DEFINES) $(SYS_INCLUDES) $(INCLUDES) $*.s
           @ $(COPY) $(_TMP_O) $@
           @ $(RM) $(_TMP_O)
           @ $(TOUCH) $@
           @ $(ECHO)
   endif


Legend:
Removed from v.1.13  
changed lines
  Added in v.1.15

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2