make/linux/makefiles/saproc.make

*** 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.
*** 67,89 ****
    BUILDLIBSAPROC = $(LIBSAPROC)
  endif
  endif
  
  ifneq ($(ALT_SASRCDIR),)
! ALT_SAINCDIR=-I$(ALT_SASRCDIR)
  else
  ALT_SAINCDIR=
  endif
  SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
  
  $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
          $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
            echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
            exit 1; \
          fi
          @echo $(LOG_INFO) Making SA debugger back-end...
!         $(QUIETLY) $(CC) -D$(BUILDARCH) -D_GNU_SOURCE                   \
                     -D_FILE_OFFSET_BITS=64                               \
                     $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG)     \
                     -I$(SASRCDIR)                                        \
                     -I$(GENERATED)                                       \
                     -I$(BOOT_JAVA_HOME)/include                          \
--- 67,91 ----
    BUILDLIBSAPROC = $(LIBSAPROC)
  endif
  endif
  
  ifneq ($(ALT_SASRCDIR),)
! ALT_SAINCDIR=-I$(ALT_SASRCDIR) -DALT_SASRCDIR
  else
  ALT_SAINCDIR=
  endif
  SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
  
+ SAARCH ?= $(BUILDARCH)
+ 
  $(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
          $(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
            echo "ALT_BOOTDIR, BOOTDIR or JAVA_HOME needs to be defined to build SA"; \
            exit 1; \
          fi
          @echo $(LOG_INFO) Making SA debugger back-end...
!         $(QUIETLY) $(CC) -D$(SAARCH) -D_GNU_SOURCE                      \
                     -D_FILE_OFFSET_BITS=64                               \
                     $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG)     \
                     -I$(SASRCDIR)                                        \
                     -I$(GENERATED)                                       \
                     -I$(BOOT_JAVA_HOME)/include                          \