Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ BUILD_TARGET = @BUILD_TARGET@
BUILD_MULTILIB = @BUILD_MULTILIB@
BUILD_GNU3 = @BUILD_GNU3@
BUILD_FORTRAN = @BUILD_FORTRAN@
BUILD_JFE = @BUILD_JFE@
BUILD_TYPE = @BUILD_TYPE@
BUILD_SKIP_IPA = @BUILD_SKIP_IPA@
BUILD_PRODUCT = @BUILD_PRODUCT@
Expand Down Expand Up @@ -138,12 +139,16 @@ endif

GNU4_FE_COMPONENTS = \
$(NATIVE_BUILD_DIR)/wgen/wgen42 \
$(NATIVE_BUILD_DIR)/jfe/jfe \
$(NATIVE_BUILD_DIR)/clang2whirl/clangfe \
$(NATIVE_BUILD_DIR)/js2mplref/js2mpl \
$(GNUFE_BUILD_SUBDIR)/gcc/cc1 \
$(GNUFE_BUILD_SUBDIR)/gcc/cc1plus

ifeq ($(BUILD_JFE), YES)
GNU4_FE_COMPONENTS += \
$(NATIVE_BUILD_DIR)/jfe/jfe \
$(NATIVE_BUILD_DIR)/js2mplref/js2mpl
endif

GNU3_FE_COMPONENTS = \
$(NATIVE_BUILD_DIR)/gccfe/gfec \
$(NATIVE_BUILD_DIR)/g++fe/gfecc
Expand Down Expand Up @@ -528,9 +533,11 @@ clobber: clean
clean: $(CLEAN_LIB)
$(MAKE) -C $(NATIVE_BUILD_DIR)/driver clobber
$(MAKE) -C $(NATIVE_BUILD_DIR)/wgen clobber
$(MAKE) -C $(NATIVE_BUILD_DIR)/jfe clobber
$(MAKE) -C $(NATIVE_BUILD_DIR)/clang2whirl clobber
ifeq ($(BUILD_JFE), YES)
$(MAKE) -C $(NATIVE_BUILD_DIR)/jfe clobber
$(MAKE) -C $(NATIVE_BUILD_DIR)/js2mplref clobber
endif
ifeq ($(BUILD_GNU3), YES)
$(MAKE) -C $(NATIVE_BUILD_DIR)/gccfe clobber
$(MAKE) -C $(NATIVE_BUILD_DIR)/g++fe clobber
Expand Down
25 changes: 24 additions & 1 deletion configure
Original file line number Diff line number Diff line change
Expand Up @@ -594,6 +594,7 @@ BUILD_TYPE
BUILD_SKIP_IPA
WHIRL_HAS_ID_FIELD
BUILD_FORTRAN
BUILD_JFE
BUILD_GNU3
TARG_INFO_NAME
COMPILER_TARG_DIR
Expand Down Expand Up @@ -681,6 +682,7 @@ with_build_ffe_optimize
with_build_lib_optimize
enable_gnu3
enable_fortran
enable_jfe
enable_whirl_id
enable_ipa
enable_multilib
Expand Down Expand Up @@ -1318,6 +1320,8 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-gnu3 Enable GNU3-based C/C++ frontend
--disable-fortran Disable Fortran language support
--disable-jfe Disable Java Frontend (JFE) and js2mpl
(requires gradle, openjdk-8, cmake)
--enable-whirl-id Enable debugging ID in WHIRL node
--disable-ipa Disable IPA compilation support (EXPERIMENTAL)
--disable-multilib Disable multilib support for IA32/x86-64
Expand Down Expand Up @@ -2052,6 +2056,19 @@ if test "x$enable_fortran" != "xno"; then :

fi

# Set whether to build the Java Frontend (JFE) and js2mpl
# Check whether --enable-jfe was given.
if test "${enable_jfe+set}" = set; then :
enableval=$enable_jfe;
fi


if test "x$enable_jfe" != "xno"; then :

BUILD_JFE=YES

fi

# Set whether WHIRL a node contains a debugging ID
# Check whether --enable-whirl_id was given.
if test "${enable_whirl_id+set}" = set; then :
Expand Down Expand Up @@ -3846,9 +3863,11 @@ fi


#
# Starting JFE Checks
# Starting JFE Checks (only when --enable-jfe or default)
#

if [ "x$enable_jfe" != "xno" ]; then

ISRUNNABLE_JFE=1
printf "checking whether gradle works "
if [ $(which gradle) ]
Expand Down Expand Up @@ -3922,6 +3941,10 @@ then
exit 1
fi

else
echo "JFE build disabled (use --enable-jfe to enable)"
fi

printf "checking CLANG_HOME is set ..."
if [ -z $CLANG_HOME ]
then
Expand Down
17 changes: 16 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,14 @@ AS_IF([test "x$enable_fortran" != "xno"], [
BUILD_FORTRAN=YES
])

# Set whether to build the Java Frontend (JFE) and js2mpl
AC_ARG_ENABLE([jfe],
AS_HELP_STRING([--disable-jfe], [Disable Java Frontend (JFE) and js2mpl (requires gradle, openjdk-8, cmake)]))

AS_IF([test "x$enable_jfe" != "xno"], [
BUILD_JFE=YES
])

# Set whether WHIRL a node contains a debugging ID
AC_ARG_ENABLE([whirl_id],
AS_HELP_STRING([--enable-whirl-id], [Enable debugging ID in WHIRL node]))
Expand Down Expand Up @@ -463,6 +471,7 @@ AC_SUBST([COMPILER_TARG_DIR])
AC_SUBST([TARG_INFO_NAME])
AC_SUBST([BUILD_GNU3])
AC_SUBST([BUILD_FORTRAN])
AC_SUBST([BUILD_JFE])
AC_SUBST([WHIRL_HAS_ID_FIELD])
AC_SUBST([BUILD_SKIP_IPA])
AC_SUBST([BUILD_TYPE])
Expand Down Expand Up @@ -632,9 +641,11 @@ AC_CONFIG_SUBDIRS(binutils)
AC_OUTPUT

#
# Starting JFE Checks
# Starting JFE Checks (only when --enable-jfe or default)
#

if @<:@ "x$enable_jfe" != "xno" @:>@; then

ISRUNNABLE_JFE=1
printf "checking whether gradle works "
if @<:@ $(which gradle) @:>@
Expand Down Expand Up @@ -708,6 +719,10 @@ then
exit 1
fi

else
echo "JFE build disabled (use --enable-jfe to enable)"
fi

printf "checking CLANG_HOME is set ..."
if @<:@ -z $CLANG_HOME @:>@
then
Expand Down