make/bsd/makefiles/jsig.make

rev 9009 : 8136556: Add the ability to perform static builds of MacOSX x64 binaries
Reviewed-by: ihse, bdelsart, gadams, lfoltan, rriggs, hseigel, twisti

*** 1,7 ****
  #
! # Copyright (c) 2005, 2014, 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) 2005, 2015, 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.
*** 26,38 ****
  
  # libjsig.so: signal interposition library
  JSIG   = jsig
  
  ifeq ($(OS_VENDOR), Darwin)
!   LIBJSIG   = lib$(JSIG).dylib
  
!   LIBJSIG_DEBUGINFO   = lib$(JSIG).dylib.dSYM
    LIBJSIG_DIZ         = lib$(JSIG).diz
  else
    LIBJSIG   = lib$(JSIG).so
  
    LIBJSIG_DEBUGINFO   = lib$(JSIG).debuginfo
--- 26,38 ----
  
  # libjsig.so: signal interposition library
  JSIG   = jsig
  
  ifeq ($(OS_VENDOR), Darwin)
!   LIBJSIG   = lib$(JSIG).$(LIBRARY_SUFFIX)
  
!   LIBJSIG_DEBUGINFO   = lib$(JSIG).$(LIBRARY_SUFFIX).dSYM
    LIBJSIG_DIZ         = lib$(JSIG).diz
  else
    LIBJSIG   = lib$(JSIG).so
  
    LIBJSIG_DEBUGINFO   = lib$(JSIG).debuginfo
*** 59,70 ****
--- 59,76 ----
    JSIG_DEBUG_CFLAGS = -g
  endif
  
  $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE)
          @echo $(LOG_INFO) Making signal interposition lib...
+ ifeq ($(STATIC_BUILD),true)
+         $(QUIETLY) $(CC) -c $(SYMFLAG) $(EXTRA_CFLAGS) $(ARCHFLAG) $(PICFLAG) \
+             $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $(JSIG).o $<
+         $(QUIETLY) $(AR) $(ARFLAGS) $@ $(JSIG).o
+ else
          $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \
                           $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $<
+ endif
  ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
    ifeq ($(OS_VENDOR), Darwin)
          $(DSYMUTIL) $@
      ifeq ($(ZIP_DEBUGINFO_FILES),1)
          $(ZIPEXE) -q -r -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO)