support O= output directory on toplevel make

respects both $(JULIAHOME)/Make.user and $(O)/Make.user

Make.inc

@@ -2,7 +2,8 @@
 
 ## Note:
 ## It is generally preferable to change these options, for
-## your local machine, in a file named `Make.user` in this directory
+## your local machine, in a file named `Make.user` in the toplevel
+## and build directories
 
 # OPENBLAS build options
 OPENBLAS_TARGET_ARCH=
@@ -71,10 +72,26 @@ WITH_GC_DEBUG_ENV = 0
 # Prevent picking up $ARCH from the environment variables
 ARCH=
 
+# pick up BUILDROOT from O= if it isn't already set (from recursive make)
+ifeq ($(BUILDROOT),)
+ifeq ("$(origin O)", "command line")
+ BUILDROOT := $(abspath $O)
+ BUILDDIR := $(abspath $(BUILDROOT)/$(shell $(JULIAHOME)/contrib/relative_path.sh $(JULIAHOME) $(SRCDIR)))
+ $(info $(shell printf '\033[32;1mBuilding into $(BUILDROOT)\033[0m')) # use printf to expand the escape sequences
+else
+ BUILDROOT:=$(JULIAHOME)
+endif
+endif
+export BUILDROOT
+
 # we include twice to pickup user definitions better
+# include from JULIAHOME first so that BUILDROOT can override
 ifeq (exists, $(shell [ -e $(JULIAHOME)/Make.user ] && echo exists ))
 include $(JULIAHOME)/Make.user
 endif
+ifeq (exists, $(shell [ -e $(BUILDROOT)/Make.user ] && echo exists ))
+include $(BUILDROOT)/Make.user
+endif
 
 # disable automatic Makefile rules
 .SUFFIXES:
@@ -110,7 +127,7 @@ includedir = $(prefix)/include
 sysconfdir = $(prefix)/etc
 
 # Directories where things get built into
-build_prefix = $(JULIAHOME)/usr
+build_prefix = $(BUILDROOT)/usr
 build_staging = $(build_prefix)-staging
 build_bindir = $(build_prefix)/bin
 build_libdir = $(build_prefix)/lib
@@ -399,6 +416,9 @@ endif
 ifeq (exists, $(shell [ -e $(JULIAHOME)/Make.user ] && echo exists ))
 include $(JULIAHOME)/Make.user
 endif
+ifeq (exists, $(shell [ -e $(BUILDROOT)/Make.user ] && echo exists ))
+include $(BUILDROOT)/Make.user
+endif
 
 ifeq ($(SANITIZE),1)
 ifeq ($(SANITIZE_MEMORY),1)

base/Makefile

@@ -1,6 +1,6 @@
 SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+BUILDDIR := .
 JULIAHOME := $(abspath $(SRCDIR)/..)
-BUILDDIR ?= .
 include $(JULIAHOME)/deps/Versions.make
 include $(JULIAHOME)/Make.inc
 

base/client.jl

@@ -406,6 +406,8 @@ function _atreplinit(repl)
 end
 
 function _start()
+ empty!(ARGS)
+ append!(ARGS, Core.ARGS)
  opts = JLOptions()
  try
  (quiet,repl,startup,color_set,history_file) = process_options(opts,copy(ARGS))

base/fs.jl

@@ -47,7 +47,7 @@ export File,
 import Base: uvtype, uvhandle, eventloop, fd, position, stat, close, write, read, read!, readbytes, isopen,
  _sizeof_uv_fs, uv_error
 
-include("file_constants.jl")
+include(string(length(Core.ARGS)>=2?Core.ARGS[2]:"","file_constants.jl")) # include($BUILDROOT/base/file_constants.jl)
 
 abstract AbstractFile <: IO
 

base/libc.jl

@@ -6,7 +6,7 @@ export FILE, TmStruct, strftime, strptime, getpid, gethostname, free, malloc, ca
  errno, strerror, flush_cstdio, systemsleep, time
 @windows_only export GetLastError, FormatMessage
 
-include("errno.jl")
+include(string(length(Core.ARGS)>=2?Core.ARGS[2]:"","errno_h.jl")) # include($BUILDROOT/base/errno_h.jl)
 
 ## RawFD ##
 

base/pcre.jl

@@ -4,7 +4,7 @@
 
 module PCRE
 
-include("pcre_h.jl")
+include(string(length(Core.ARGS)>=2?Core.ARGS[2]:"","pcre_h.jl")) # include($BUILDROOT/base/pcre_h.jl)
 
 const PCRE_LIB = "libpcre2-8"
 

base/rounding.jl

@@ -1,7 +1,7 @@
 # This file is a part of Julia. License is MIT: http:https://julialang.org/license
 
 module Rounding
-include("fenv_constants.jl")
+include(UTF8String(vcat(length(Core.ARGS)>=2?Core.ARGS[2].data:"".data, "fenv_constants.jl".data))) # include($BUILDROOT/base/fenv_constants.jl)
 
 export
  RoundingMode, RoundNearest, RoundToZero, RoundUp, RoundDown, RoundFromZero,
@@ -41,8 +41,8 @@ function from_fenv(r::Integer)
  end
 end
 
-set_rounding_raw{T<:Union{Float32,Float64}}(::Type{T},i::Integer) = ccall(:fesetround, Cint, (Cint,), i)
-get_rounding_raw{T<:Union{Float32,Float64}}(::Type{T}) = ccall(:fegetround, Cint, ())
+set_rounding_raw{T<:Union{Float32,Float64}}(::Type{T},i::Integer) = ccall(:fesetround, Int32, (Int32,), i)
+get_rounding_raw{T<:Union{Float32,Float64}}(::Type{T}) = ccall(:fegetround, Int32, ())
 
 set_rounding{T<:Union{Float32,Float64}}(::Type{T},r::RoundingMode) = set_rounding_raw(T,to_fenv(r))
 get_rounding{T<:Union{Float32,Float64}}(::Type{T}) = from_fenv(get_rounding_raw(T))

base/stream.jl

@@ -1,7 +1,6 @@
 # This file is a part of Julia. License is MIT: http:https://julialang.org/license
 
-#TODO: Move stdio detection from C to Julia (might require some Clang magic)
-include("uv_constants.jl")
+include(string(length(Core.ARGS)>=2?Core.ARGS[2]:"","uv_constants.jl")) # include($BUILDROOT/base/uv_constants.jl)
 
 import .Libc: RawFD, dup
 @windows_only import .Libc: WindowsRawSocket

base/sysimg.jl

@@ -31,9 +31,6 @@ include("essentials.jl")
 include("docs/bootstrap.jl")
 include("base.jl")
 include("reflection.jl")
-include("build_h.jl")
-include("version_git.jl")
-include("c.jl")
 include("options.jl")
 
 # core operations & types
@@ -81,7 +78,10 @@ include("dict.jl")
 include("set.jl")
 include("iterator.jl")
 
-# For OS specific stuff in I/O
+# For OS specific stuff
+include(UTF8String(vcat(length(Core.ARGS)>=2?Core.ARGS[2].data:"".data, "build_h.jl".data))) # include($BUILDROOT/base/build_h.jl)
+include(UTF8String(vcat(length(Core.ARGS)>=2?Core.ARGS[2].data:"".data, "version_git.jl".data))) # include($BUILDROOT/base/version_git.jl)
+include("c.jl")
 include("osutils.jl")
 
 # strings & printing

contrib/windows/msys_build.sh

@@ -110,6 +110,7 @@ done
 for i in share/julia/base/pcre_h.jl; do
  $SEVENZIP e -y julia-installer.exe "\$_OUTDIR/$i" -obase >> get-deps.log
 done
+echo "override PCRE_INCL_PATH =" >> Make.user
 # suppress "bash.exe: warning: could not find /tmp, please create!"
 mkdir -p usr/Git/tmp
 # Remove libjulia.dll if it was copied from downloaded binary