equal
deleted
inserted
replaced
76 # cygwin). |
76 # cygwin). |
77 # $1: The name of the variable to fix |
77 # $1: The name of the variable to fix |
78 AC_DEFUN([BASIC_FIXUP_PATH], |
78 AC_DEFUN([BASIC_FIXUP_PATH], |
79 [ |
79 [ |
80 # Only process if variable expands to non-empty |
80 # Only process if variable expands to non-empty |
81 |
81 |
82 if test "x[$]$1" != x; then |
82 if test "x[$]$1" != x; then |
83 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
83 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
84 BASIC_FIXUP_PATH_CYGWIN($1) |
84 BASIC_FIXUP_PATH_CYGWIN($1) |
85 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
85 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
86 BASIC_FIXUP_PATH_MSYS($1) |
86 BASIC_FIXUP_PATH_MSYS($1) |
116 # it need to be in the PATH. |
116 # it need to be in the PATH. |
117 # $1: The name of the variable to fix |
117 # $1: The name of the variable to fix |
118 AC_DEFUN([BASIC_FIXUP_EXECUTABLE], |
118 AC_DEFUN([BASIC_FIXUP_EXECUTABLE], |
119 [ |
119 [ |
120 # Only process if variable expands to non-empty |
120 # Only process if variable expands to non-empty |
121 |
121 |
122 if test "x[$]$1" != x; then |
122 if test "x[$]$1" != x; then |
123 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
123 if test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.cygwin"; then |
124 BASIC_FIXUP_EXECUTABLE_CYGWIN($1) |
124 BASIC_FIXUP_EXECUTABLE_CYGWIN($1) |
125 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
125 elif test "x$OPENJDK_BUILD_OS_ENV" = "xwindows.msys"; then |
126 BASIC_FIXUP_EXECUTABLE_MSYS($1) |
126 BASIC_FIXUP_EXECUTABLE_MSYS($1) |
707 # You can run make from the OUTPUT_ROOT, or from the top-level Makefile |
707 # You can run make from the OUTPUT_ROOT, or from the top-level Makefile |
708 # which will look for generated configurations |
708 # which will look for generated configurations |
709 AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) |
709 AC_CONFIG_FILES([$OUTPUT_ROOT/Makefile:$AUTOCONF_DIR/Makefile.in]) |
710 ]) |
710 ]) |
711 |
711 |
712 AC_DEFUN_ONCE([BASIC_SETUP_LOGGING], |
|
713 [ |
|
714 # Setup default logging of stdout and stderr to build.log in the output root. |
|
715 BUILD_LOG='$(OUTPUT_ROOT)/build.log' |
|
716 BUILD_LOG_PREVIOUS='$(OUTPUT_ROOT)/build.log.old' |
|
717 BUILD_LOG_WRAPPER='$(BASH) $(SRC_ROOT)/common/bin/logger.sh $(BUILD_LOG)' |
|
718 AC_SUBST(BUILD_LOG) |
|
719 AC_SUBST(BUILD_LOG_PREVIOUS) |
|
720 AC_SUBST(BUILD_LOG_WRAPPER) |
|
721 ]) |
|
722 |
|
723 |
|
724 #%%% Simple tools %%% |
712 #%%% Simple tools %%% |
725 |
713 |
726 # Check if we have found a usable version of make |
714 # Check if we have found a usable version of make |
727 # $1: the path to a potential make binary (or empty) |
715 # $1: the path to a potential make binary (or empty) |
728 # $2: the description on how we found this |
716 # $2: the description on how we found this |