make/solaris/makefiles/rules.make

*** 1,7 ****
  #
! # Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
--- 1,7 ----
  #
! # Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
*** 149,166 ****
  # Sun compiler for 64 bit Solaris does not support building non-PIC object files.
  ifdef LP64
  %.o: %.cpp
          @echo Compiling $<
          $(QUIETLY) $(REMOVE_TARGET)
!         $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
  else
  %.o: %.cpp
          @echo Compiling $<
          $(QUIETLY) $(REMOVE_TARGET)
          $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
!          $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) -o $@ $< $(COMPILE_DONE), \
!          $(COMPILE.CC) -o $@ $< $(COMPILE_DONE))
  endif
  
  %.o: %.s
          @echo Assembling $<
          $(QUIETLY) $(REMOVE_TARGET)
--- 149,166 ----
  # Sun compiler for 64 bit Solaris does not support building non-PIC object files.
  ifdef LP64
  %.o: %.cpp
          @echo Compiling $<
          $(QUIETLY) $(REMOVE_TARGET)
!         $(QUIETLY) $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE)
  else
  %.o: %.cpp
          @echo Compiling $<
          $(QUIETLY) $(REMOVE_TARGET)
          $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
!            $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE), \
!            $(COMPILE.CC) $(DEPFLAGS) -o $@ $< $(COMPILE_DONE))
  endif
  
  %.o: %.s
          @echo Assembling $<
          $(QUIETLY) $(REMOVE_TARGET)