Author: yug
Date: 2011-01-12 02:45:28 -0500 (Wed, 12 Jan 2011)
New Revision: 3456
Modified:
trunk/Makefile.in
trunk/configure
trunk/configure.ac
trunk/install_compiler.sh
Log:
Add build system support for --disable-fortran and --enable-gnu3. one can now
use configure --disable-fortran to disable fortran build and install,
--enable-gnu3 to build and install gnu3 c/c++ front end.
This work is reviewed, revised and approved by David Coakley.
Modified: trunk/Makefile.in
===================================================================
--- trunk/Makefile.in 2011-01-12 07:13:19 UTC (rev 3455)
+++ trunk/Makefile.in 2011-01-12 07:45:28 UTC (rev 3456)
@@ -37,7 +37,6 @@
# The directory where all native compiler component build subdirectories
# are located
#
-
MACHINE_TYPE = @MACHINE_TYPE@
COMPILER_TARG_DIR = @abs_top_builddir@/osprey/targdir
LIB_BUILD_AREA = @abs_top_builddir@/osprey/targdir_lib
@@ -68,6 +67,7 @@
BUILD_TARGET = @BUILD_TARGET@
BUILD_MULTILIB = @BUILD_MULTILIB@
BUILD_GNU3 = @BUILD_GNU3@
+BUILD_FORTRAN = @BUILD_FORTRAN@
ifeq ($(MACHINE_TYPE), ia64)
# ia64
@@ -106,11 +106,16 @@
$(NATIVE_BUILD_DIR)/ipl/ipl \
$(NATIVE_BUILD_DIR)/whirl2c/whirl2c.so \
$(NATIVE_BUILD_DIR)/whirl2c/whirl2c \
- $(NATIVE_BUILD_DIR)/whirl2f/whirl2f.so \
- $(NATIVE_BUILD_DIR)/whirl2f/whirl2f \
$(NATIVE_BUILD_DIR)/ir_tools/ir_b2a \
$(NATIVE_BUILD_DIR_LD)/ld/ld-new
+ifeq ($(BUILD_FORTRAN), YES)
+BASIC_COMPONENTS += \
+ $(NATIVE_BUILD_DIR)/whirl2f/whirl2f.so \
+ $(NATIVE_BUILD_DIR)/whirl2f/whirl2f
+endif
+
+
GNU4_FE_COMPONENTS = \
$(NATIVE_BUILD_DIR)/wgen/wgen42 \
$(GNUFE_BUILD_DIR)/gcc/cc1 \
@@ -120,7 +125,7 @@
$(NATIVE_BUILD_DIR)/gccfe/gfec \
$(NATIVE_BUILD_DIR)/g++fe/gfecc
-ifneq ($(MACHINE_TYPE), SL)
+ifeq ($(BUILD_FORTRAN), YES)
FORT_FE_COMPONENTS = \
$(NATIVE_BUILD_DIR)/crayf90/sgi/mfef95
endif
@@ -146,10 +151,14 @@
NATIVE_COMPONENTS += $(GNU3_FE_COMPONENTS)
endif
+
+
CROSS_COMPONENTS = $(BASIC_COMPONENTS) $(TARGET_EXTRA_OBJ) \
$(FORT_FE_COMPONENTS)
+
+
BASIC_PHONY_TARGET = $(shell for i in $(BASIC_COMPONENTS); do basename "$$i" ;
done)
CROSS_PHONY_TARGET = $(shell for i in $(CROSS_COMPONENTS); do basename "$$i" ;
done)
@@ -320,10 +329,10 @@
install_compiler:
export toolro...@prefix@; \
export TOP_SRCDIR=$(TOP_SRCDIR); \
- $(TOP_SRCDIR)/install_compiler.sh $(MACHINE_TYPE)
+ $(TOP_SRCDIR)/install_compiler.sh $(MACHINE_TYPE) $(if
$(BUILD_FORTRAN),"YES","NO")
endif
install-cross:
- export toolro...@prefix@; $(TOP_SRCDIR)/install_compiler.sh ia64-cross
+ export toolro...@prefix@; $(TOP_SRCDIR)/install_compiler.sh ia64-cross
$(if $(BUILD_FORTRAN),"YES","NO")
$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
install-common
$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
@@ -336,7 +345,7 @@
install-driver
$(MAKE) -C $(GNUFE_BUILD_DIR)/$(GNUFE_BUILD_HOST)/libstdc++-v3 \
install
- export toolro...@prefix@; $(TOP_SRCDIR)/install_compiler.sh ia64-cross
+ export toolro...@prefix@; $(TOP_SRCDIR)/install_compiler.sh ia64-cross
$(if $(BUILD_FORTRAN),"YES","NO")
LIB_ARGS = BUILD_TARGET=$(LIB_BUILD_TARGET) BUILD_COMPILER=SELF
BUILD_AREA=$(LIB_BUILD_AREA) MACHINE_TYPE=$(LIB_MACHINE_TYPE)
BUILD_ABI=$(LIB_BUILD_ABI) BUILD_ARCH=$(LIB_BUILD_ARCH)
BUILD_HOST=$(LIB_BUILD_HOST) build_optimi...@build_lib_optimize@
ifeq ($(LIB_BUILD_TARGET),IA64)
@@ -379,12 +388,12 @@
$(MAKE) -C $(NATIVE_BUILD_DIR)/ipl clobber
$(MAKE) -C $(NATIVE_BUILD_DIR)/lw_inline clobber
$(MAKE) -C $(NATIVE_BUILD_DIR)/whirl2c clobber
- $(MAKE) -C $(NATIVE_BUILD_DIR)/whirl2f clobber
$(MAKE) -C $(NATIVE_BUILD_DIR)/libkapi clobber
$(MAKE) -C $(NATIVE_BUILD_DIR)/targ_info clobber
$(MAKE) -C $(NATIVE_BUILD_DIR)/ir_tools clobber
-ifneq ($(MACHINE_TYPE), SL)
- $(MAKE) -C $(NATIVE_BUILD_DIR)/crayf90 clobber
+ifeq ($(BUILD_FORTRAN), YES)
+ $(MAKE) -C $(NATIVE_BUILD_DIR)/crayf90 clobber
+ $(MAKE) -C $(NATIVE_BUILD_DIR)/whirl2f clobber
endif
$(MAKE) -C $(NATIVE_BUILD_DIR)/arith clobber
$(MAKE) -C $(NATIVE_BUILD_DIR)/include clobber
Modified: trunk/configure
===================================================================
--- trunk/configure 2011-01-12 07:13:19 UTC (rev 3455)
+++ trunk/configure 2011-01-12 07:45:28 UTC (rev 3456)
@@ -273,7 +273,7 @@
ac_subdirs_all="$ac_subdirs_all osprey/cygnus"
ac_subdirs_all="$ac_subdirs_all osprey-gcc-4.2.0"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os MACHINE_TYPE BUILD_ABI BUILD_ARCH BUILD_HOST
BUILD_TARGET BUILD_VENDOR BUILD_OPTIMIZE BUILD_LIB_OPTIMIZE BUILD_COMPILER
BUILD_BOTH LIB_MACHINE_TYPE LIB_BUILD_TARGET LIB_BUILD_ABI LIB_BUILD_ARCH
LIB_BUILD_HOST LIB2_MACHINE_TYPE LIB2_BUILD_TARGET LIB2_BUILD_ABI
LIB2_BUILD_ARCH LIB2_BUILD_HOST BUILD_MULTILIB COMPILER_TARG_DIR TARG_INFO_NAME
BUILD_GNU3 GCC_CONFIGURE_TARG GCC_DIR LIBLIST subdirs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME
PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix
program_transform_name bindir sbindir libexecdir datadir sysconfdir
sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir
build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build
build_cpu build_vendor build_os host host_cpu host_vendor host_os target
target_cpu target_vendor target_os MACHINE_TYPE BUILD_ABI BUILD_ARCH BUILD_HOST
BUILD_TARGET BUILD_VENDOR BUILD_OPTIMIZE BUILD_LIB_OPTIMIZE BUILD_COMPILER
BUILD_BOTH LIB_MACHINE_TYPE LIB_BUILD_TARGET LIB_BUILD_ABI LIB_BUILD_ARCH
LIB_BUILD_HOST LIB2_MACHINE_TYPE LIB2_BUILD_TARGET LIB2_BUILD_ABI
LIB2_BUILD_ARCH LIB2_BUILD_HOST BUILD_MULTILIB COMPILER_TARG_DIR TARG_INFO_NAME
BUILD_GNU3 BUILD_FORTRAN GCC_CONFIGURE_TARG GCC_DIR LIBLIST subdirs LIBOBJS
LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -788,6 +788,12 @@
esac
cat <<\_ACEOF
+Optional Features:
+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-gnu3 Enable GNU3-based C/C++ frontend
+ --disable-fortran Disable Fortran language support
+
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
@@ -1448,9 +1454,34 @@
# BUILD_BOTH is (only) used in osprey/Makefile.gsetup.in for setting -fPIC.
BUILD_BOTH=
-# Set BUILD_GNU3 to "YES" to build the GCC 3.3 C/C++ front-end.
-BUILD_GNU3=NO
+# Set whether to build the GCC 3.3 C/C++ front-end.
+# Check whether --enable-gnu3 or --disable-gnu3 was given.
+if test "${enable_gnu3+set}" = set; then
+ enableval="$enable_gnu3"
+fi;
+
+if test "x$enable_gnu3" = "xyes"; then
+
+ BUILD_GNU3=YES
+
+fi
+
+
+# Set whether Fortran driver and libraries will be built.
+# Check whether --enable-fortran or --disable-fortran was given.
+if test "${enable_fortran+set}" = set; then
+ enableval="$enable_fortran"
+
+fi;
+
+if test "x$enable_fortran" != "xno"; then
+
+ BUILD_FORTRAN=YES
+
+fi
+
+
# Specify the targ_info directory under osprey/common to use. IA64 uses
# ipfec_targ_info instead of targ_info.
TARG_INFO_NAME=targ_info
@@ -1646,11 +1677,17 @@
+
# List of configurable files to create in object directory.
-
ac_config_files="$ac_config_files Makefile
osprey/Makefile.gsetup osprey/targdir/libspin/Makefile
osprey/targdir/libspin_4_2_0/Makefile osprey/targdir/include/Makefile
osprey/targdir/driver/Makefile osprey/targdir/libiberty/Makefile
osprey/targdir/targ_info/Makefile osprey/targdir/be/Makefile
osprey/targdir/libelf/Makefile osprey/targdir/libelfutil/Makefile
osprey/targdir/libdwarf/Makefile osprey/targdir/libunwindP/Makefile
osprey/targdir/cg/Makefile osprey/targdir/wopt/Makefile
osprey/targdir/ipl/Makefile osprey/targdir/lno/Makefile
osprey/targdir/lw_inline/Makefile osprey/targdir/ipa/Makefile
osprey/targdir/whirl2c/Makefile osprey/targdir/whirl2f/Makefile
osprey/targdir/libcomutil/Makefile osprey/targdir/ir_tools/Makefile
osprey/targdir/libcmplrs/Makefile osprey/targdir/wgen/Makefile
osprey/targdir/libcif/Makefile osprey/targdir/arith/Makefile
osprey/targdir/orc_ict/Makefile osprey/targdir/orc_intel/Makefile
osprey/targdir/libkapi/Makefile osprey/targdir/crayf90/Makefile
osprey/targdir/crayf90/fe90/Makefile osprey/targdir/crayf90/libf90sgi/Makefile
osprey/targdir/crayf90/sgi/Makefile"
+
ac_config_files="$ac_config_files Makefile osprey/Makefile.gsetup
osprey/targdir/libspin/Makefile osprey/targdir/libspin_4_2_0/Makefile
osprey/targdir/include/Makefile osprey/targdir/driver/Makefile
osprey/targdir/libiberty/Makefile osprey/targdir/targ_info/Makefile
osprey/targdir/be/Makefile osprey/targdir/libelf/Makefile
osprey/targdir/libelfutil/Makefile osprey/targdir/libdwarf/Makefile
osprey/targdir/libunwindP/Makefile osprey/targdir/cg/Makefile
osprey/targdir/wopt/Makefile osprey/targdir/ipl/Makefile
osprey/targdir/lno/Makefile osprey/targdir/lw_inline/Makefile
osprey/targdir/ipa/Makefile osprey/targdir/whirl2c/Makefile
osprey/targdir/libcomutil/Makefile osprey/targdir/ir_tools/Makefile
osprey/targdir/libcmplrs/Makefile osprey/targdir/wgen/Makefile
osprey/targdir/libcif/Makefile osprey/targdir/arith/Makefile
osprey/targdir/orc_ict/Makefile osprey/targdir/orc_intel/Makefile
osprey/targdir/libkapi/Makefile"
-if test $BUILD_GNU3 = "YES"; then
+if test "${BUILD_FORTRAN}" = "YES"; then
+
ac_config_files="$ac_config_files osprey/targdir/whirl2f/Makefile
osprey/targdir/crayf90/Makefile osprey/targdir/crayf90/fe90/Makefile
osprey/targdir/crayf90/libf90sgi/Makefile osprey/targdir/crayf90/sgi/Makefile"
+
+fi
+
+if test "${BUILD_GNU3}" = "YES"; then
ac_config_files="$ac_config_files
osprey/targdir/gccfe/Makefile osprey/targdir/gccfe/gnu/Makefile
osprey/targdir/g++fe/Makefile osprey/targdir/g++fe/gnu/Makefile"
fi
@@ -1664,14 +1701,25 @@
if test "${BUILD_TARGET}" = "SL"; then
LIBLIST="include"
elif test "${BUILD_TARGET}" = "IA64"; then
- LIBLIST="include libopenmp libfortran libmv libu"
+ LIBLIST="include libopenmp libmv"
+ if test "${BUILD_FORTRAN}" = "YES"; then
+ LIBLIST="$LIBLIST libfortran libu"
+ fi
else
- LIBLIST="include libopenmp libfortran libhugetlbfs libmv libu"
+ LIBLIST="include libopenmp libhugetlbfs libmv"
+ if test "${BUILD_FORTRAN}" = "YES"; then
+ LIBLIST="$LIBLIST libfortran libu"
+ fi
fi
-
ac_config_files="$ac_config_files osprey/targdir_lib/Makefile
osprey/targdir_lib/include/Makefile osprey/targdir_lib/libopenmp/Makefile
osprey/targdir_lib/libfortran/Makefile osprey/targdir_lib/libhugetlbfs/Makefile
osprey/targdir_lib/libmv/Makefile osprey/targdir_lib/libu/Makefile"
+
ac_config_files="$ac_config_files osprey/targdir_lib/Makefile
osprey/targdir_lib/include/Makefile osprey/targdir_lib/libopenmp/Makefile
osprey/targdir_lib/libhugetlbfs/Makefile osprey/targdir_lib/libmv/Makefile"
+if test "${BUILD_FORTRAN}" = "YES"; then
+ ac_config_files="$ac_config_files
osprey/targdir_lib/libfortran/Makefile osprey/targdir_lib/libu/Makefile"
+
+fi
+
if test "${BUILD_TARGET}" = "X8664" || test "${BUILD_TARGET}" = "IA32"; then
LIBLIST="libopen64rt libacml_mv $LIBLIST libinstr2"
ac_config_files="$ac_config_files
osprey/targdir_lib/libopen64rt/Makefile osprey/targdir_lib/libinstr2/Makefile
osprey/targdir_lib/libacml_mv/Makefile"
@@ -1679,8 +1727,12 @@
fi
if test $BUILD_MULTILIB = "YES"; then
-
ac_config_files="$ac_config_files
osprey/targdir_lib2/Makefile:osprey/targdir_lib/Makefile.in
osprey/targdir_lib2/include/Makefile:osprey/targdir_lib/include/Makefile.in
osprey/targdir_lib2/libopenmp/Makefile:osprey/targdir_lib/libopenmp/Makefile.in
osprey/targdir_lib2/libfortran/Makefile:osprey/targdir_lib/libfortran/Makefile.in
osprey/targdir_lib2/libhugetlbfs/Makefile:osprey/targdir_lib/libhugetlbfs/Makefile.in
osprey/targdir_lib2/libmv/Makefile:osprey/targdir_lib/libmv/Makefile.in
osprey/targdir_lib2/libu/Makefile:osprey/targdir_lib/libu/Makefile.in"
+
ac_config_files="$ac_config_files
osprey/targdir_lib2/Makefile:osprey/targdir_lib/Makefile.in
osprey/targdir_lib2/include/Makefile:osprey/targdir_lib/include/Makefile.in
osprey/targdir_lib2/libopenmp/Makefile:osprey/targdir_lib/libopenmp/Makefile.in
osprey/targdir_lib2/libhugetlbfs/Makefile:osprey/targdir_lib/libhugetlbfs/Makefile.in
osprey/targdir_lib2/libmv/Makefile:osprey/targdir_lib/libmv/Makefile.in"
+ if test "${BUILD_FORTRAN}" = "YES"; then
+ ac_config_files="$ac_config_files
osprey/targdir_lib2/libfortran/Makefile:osprey/targdir_lib/libfortran/Makefile.in
osprey/targdir_lib2/libu/Makefile:osprey/targdir_lib/libu/Makefile.in"
+
+ fi
if test "${BUILD_TARGET}" = "X8664" || test "${BUILD_TARGET}" = "IA32"; then
ac_config_files="$ac_config_files
osprey/targdir_lib2/libopen64rt/Makefile:osprey/targdir_lib/libopen64rt/Makefile.in
osprey/targdir_lib2/libinstr2/Makefile:osprey/targdir_lib/libinstr2/Makefile.in
osprey/targdir_lib2/libacml_mv/Makefile:osprey/targdir_lib/libacml_mv/Makefile.in"
@@ -2271,7 +2323,6 @@
"osprey/targdir/lw_inline/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/lw_inline/Makefile" ;;
"osprey/targdir/ipa/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/ipa/Makefile" ;;
"osprey/targdir/whirl2c/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/whirl2c/Makefile" ;;
- "osprey/targdir/whirl2f/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/whirl2f/Makefile" ;;
"osprey/targdir/libcomutil/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/libcomutil/Makefile" ;;
"osprey/targdir/ir_tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/ir_tools/Makefile" ;;
"osprey/targdir/libcmplrs/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/libcmplrs/Makefile" ;;
@@ -2281,6 +2332,7 @@
"osprey/targdir/orc_ict/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/orc_ict/Makefile" ;;
"osprey/targdir/orc_intel/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/orc_intel/Makefile" ;;
"osprey/targdir/libkapi/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/libkapi/Makefile" ;;
+ "osprey/targdir/whirl2f/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/whirl2f/Makefile" ;;
"osprey/targdir/crayf90/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/crayf90/Makefile" ;;
"osprey/targdir/crayf90/fe90/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/crayf90/fe90/Makefile" ;;
"osprey/targdir/crayf90/libf90sgi/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir/crayf90/libf90sgi/Makefile" ;;
@@ -2292,9 +2344,9 @@
"osprey/targdir_lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib/Makefile" ;;
"osprey/targdir_lib/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib/include/Makefile" ;;
"osprey/targdir_lib/libopenmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib/libopenmp/Makefile" ;;
- "osprey/targdir_lib/libfortran/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib/libfortran/Makefile" ;;
"osprey/targdir_lib/libhugetlbfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib/libhugetlbfs/Makefile" ;;
"osprey/targdir_lib/libmv/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib/libmv/Makefile" ;;
+ "osprey/targdir_lib/libfortran/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib/libfortran/Makefile" ;;
"osprey/targdir_lib/libu/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib/libu/Makefile" ;;
"osprey/targdir_lib/libopen64rt/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib/libopen64rt/Makefile" ;;
"osprey/targdir_lib/libinstr2/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib/libinstr2/Makefile" ;;
@@ -2302,9 +2354,9 @@
"osprey/targdir_lib2/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib2/Makefile:osprey/targdir_lib/Makefile.in" ;;
"osprey/targdir_lib2/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib2/include/Makefile:osprey/targdir_lib/include/Makefile.in" ;;
"osprey/targdir_lib2/libopenmp/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib2/libopenmp/Makefile:osprey/targdir_lib/libopenmp/Makefile.in"
;;
- "osprey/targdir_lib2/libfortran/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib2/libfortran/Makefile:osprey/targdir_lib/libfortran/Makefile.in"
;;
"osprey/targdir_lib2/libhugetlbfs/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib2/libhugetlbfs/Makefile:osprey/targdir_lib/libhugetlbfs/Makefile.in"
;;
"osprey/targdir_lib2/libmv/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib2/libmv/Makefile:osprey/targdir_lib/libmv/Makefile.in" ;;
+ "osprey/targdir_lib2/libfortran/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib2/libfortran/Makefile:osprey/targdir_lib/libfortran/Makefile.in"
;;
"osprey/targdir_lib2/libu/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib2/libu/Makefile:osprey/targdir_lib/libu/Makefile.in" ;;
"osprey/targdir_lib2/libopen64rt/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib2/libopen64rt/Makefile:osprey/targdir_lib/libopen64rt/Makefile.in"
;;
"osprey/targdir_lib2/libinstr2/Makefile" ) CONFIG_FILES="$CONFIG_FILES
osprey/targdir_lib2/libinstr2/Makefile:osprey/targdir_lib/libinstr2/Makefile.in"
;;
@@ -2428,6 +2480,7 @@
s,@COMPILER_TARG_DIR@,$COMPILER_TARG_DIR,;t t
s,@TARG_INFO_NAME@,$TARG_INFO_NAME,;t t
s,@BUILD_GNU3@,$BUILD_GNU3,;t t
+s,@BUILD_FORTRAN@,$BUILD_FORTRAN,;t t
s,@GCC_CONFIGURE_TARG@,$GCC_CONFIGURE_TARG,;t t
s,@GCC_DIR@,$GCC_DIR,;t t
s,@LIBLIST@,$LIBLIST,;t t
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2011-01-12 07:13:19 UTC (rev 3455)
+++ trunk/configure.ac 2011-01-12 07:45:28 UTC (rev 3456)
@@ -119,9 +119,22 @@
# BUILD_BOTH is (only) used in osprey/Makefile.gsetup.in for setting -fPIC.
BUILD_BOTH=
-# Set BUILD_GNU3 to "YES" to build the GCC 3.3 C/C++ front-end.
-BUILD_GNU3=NO
+# Set whether to build the GCC 3.3 C/C++ front-end.
+AC_ARG_ENABLE([gnu3],
+ AS_HELP_STRING([--enable-gnu3], [Enable GNU3-based C/C++ frontend]))
+AS_IF([test "x$enable_gnu3" = "xyes"], [
+ BUILD_GNU3=YES
+])
+
+# Set whether Fortran driver and libraries will be built.
+AC_ARG_ENABLE([fortran],
+ AS_HELP_STRING([--disable-fortran], [Disable Fortran language support]))
+
+AS_IF([test "x$enable_fortran" != "xno"], [
+ BUILD_FORTRAN=YES
+])
+
# Specify the targ_info directory under osprey/common to use. IA64 uses
# ipfec_targ_info instead of targ_info.
TARG_INFO_NAME=targ_info
@@ -310,6 +323,7 @@
AC_SUBST([COMPILER_TARG_DIR])
AC_SUBST([TARG_INFO_NAME])
AC_SUBST([BUILD_GNU3])
+AC_SUBST([BUILD_FORTRAN])
AC_SUBST([GCC_CONFIGURE_TARG])
AC_SUBST([GCC_DIR])
@@ -335,7 +349,6 @@
osprey/targdir/lw_inline/Makefile
osprey/targdir/ipa/Makefile
osprey/targdir/whirl2c/Makefile
- osprey/targdir/whirl2f/Makefile
osprey/targdir/libcomutil/Makefile
osprey/targdir/ir_tools/Makefile
osprey/targdir/libcmplrs/Makefile
@@ -345,13 +358,19 @@
osprey/targdir/orc_ict/Makefile
osprey/targdir/orc_intel/Makefile
osprey/targdir/libkapi/Makefile
+])
+
+if test "${BUILD_FORTRAN}" = "YES"; then
+ AC_CONFIG_FILES([
+ osprey/targdir/whirl2f/Makefile
osprey/targdir/crayf90/Makefile
osprey/targdir/crayf90/fe90/Makefile
osprey/targdir/crayf90/libf90sgi/Makefile
osprey/targdir/crayf90/sgi/Makefile
-])
+ ])
+fi
-if test $BUILD_GNU3 = "YES"; then
+if test "${BUILD_GNU3}" = "YES"; then
AC_CONFIG_FILES([
osprey/targdir/gccfe/Makefile
osprey/targdir/gccfe/gnu/Makefile
@@ -369,21 +388,32 @@
if test "${BUILD_TARGET}" = "SL"; then
LIBLIST="include"
elif test "${BUILD_TARGET}" = "IA64"; then
- LIBLIST="include libopenmp libfortran libmv libu"
+ LIBLIST="include libopenmp libmv"
+ if test "${BUILD_FORTRAN}" = "YES"; then
+ LIBLIST="$LIBLIST libfortran libu"
+ fi
else
- LIBLIST="include libopenmp libfortran libhugetlbfs libmv libu"
+ LIBLIST="include libopenmp libhugetlbfs libmv"
+ if test "${BUILD_FORTRAN}" = "YES"; then
+ LIBLIST="$LIBLIST libfortran libu"
+ fi
fi
AC_CONFIG_FILES([
osprey/targdir_lib/Makefile
osprey/targdir_lib/include/Makefile
osprey/targdir_lib/libopenmp/Makefile
- osprey/targdir_lib/libfortran/Makefile
osprey/targdir_lib/libhugetlbfs/Makefile
osprey/targdir_lib/libmv/Makefile
- osprey/targdir_lib/libu/Makefile
])
+if test "${BUILD_FORTRAN}" = "YES"; then
+ AC_CONFIG_FILES([
+ osprey/targdir_lib/libfortran/Makefile
+ osprey/targdir_lib/libu/Makefile
+])
+fi
+
if test "${BUILD_TARGET}" = "X8664" || test "${BUILD_TARGET}" = "IA32"; then
LIBLIST="libopen64rt libacml_mv $LIBLIST libinstr2"
AC_CONFIG_FILES([
@@ -398,11 +428,15 @@
osprey/targdir_lib2/Makefile:osprey/targdir_lib/Makefile.in
osprey/targdir_lib2/include/Makefile:osprey/targdir_lib/include/Makefile.in
osprey/targdir_lib2/libopenmp/Makefile:osprey/targdir_lib/libopenmp/Makefile.in
-
osprey/targdir_lib2/libfortran/Makefile:osprey/targdir_lib/libfortran/Makefile.in
osprey/targdir_lib2/libhugetlbfs/Makefile:osprey/targdir_lib/libhugetlbfs/Makefile.in
osprey/targdir_lib2/libmv/Makefile:osprey/targdir_lib/libmv/Makefile.in
+ ])
+ if test "${BUILD_FORTRAN}" = "YES"; then
+ AC_CONFIG_FILES([
+
osprey/targdir_lib2/libfortran/Makefile:osprey/targdir_lib/libfortran/Makefile.in
osprey/targdir_lib2/libu/Makefile:osprey/targdir_lib/libu/Makefile.in
])
+ fi
if test "${BUILD_TARGET}" = "X8664" || test "${BUILD_TARGET}" = "IA32"; then
AC_CONFIG_FILES([
osprey/targdir_lib2/libopen64rt/Makefile:osprey/targdir_lib/libopen64rt/Makefile.in
Modified: trunk/install_compiler.sh
===================================================================
--- trunk/install_compiler.sh 2011-01-12 07:13:19 UTC (rev 3455)
+++ trunk/install_compiler.sh 2011-01-12 07:45:28 UTC (rev 3456)
@@ -50,6 +50,12 @@
ARCH=$1
fi
+if [ -z "$2" ]; then
+ INSTALL_FORTRAN="YES"
+else
+ INSTALL_FORTRAN=$2
+fi
+
# set the build host
case $ARCH in
ia64 )
@@ -175,12 +181,12 @@
[ ! -d ${BIN_DIR} ] && mkdir -p ${BIN_DIR}
INSTALL_EXEC_SUB ${AREA}/driver/driver ${BIN_DIR}/opencc
INSTALL_EXEC_SUB ${AREA}/driver/driver ${BIN_DIR}/openCC
- INSTALL_EXEC_SUB ${AREA}/driver/driver ${BIN_DIR}/openf90
- INSTALL_EXEC_SUB ${AREA}/driver/driver ${BIN_DIR}/openf95
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_EXEC_SUB ${AREA}/driver/driver
${BIN_DIR}/openf90
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_EXEC_SUB ${AREA}/driver/driver
${BIN_DIR}/openf95
INSTALL_EXEC_SUB ${AREA}/driver/driver ${BIN_DIR}/opencc-${VERSION}
INSTALL_EXEC_SUB ${AREA}/driver/driver ${BIN_DIR}/openCC-${VERSION}
- INSTALL_EXEC_SUB ${AREA}/driver/driver ${BIN_DIR}/openf90-${VERSION}
- INSTALL_EXEC_SUB ${AREA}/driver/driver ${BIN_DIR}/openf95-${VERSION}
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_EXEC_SUB ${AREA}/driver/driver
${BIN_DIR}/openf90-${VERSION}
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_EXEC_SUB ${AREA}/driver/driver
${BIN_DIR}/openf95-${VERSION}
if [ "$TARG_HOST" = "ia64" ] || [ "$TARG_HOST" = "x8664" ]; then
INSTALL_EXEC_SUB ${TOP_SRCDIR}/osprey/targdir/driver/kdriver
${BIN_DIR}/kopencc
@@ -293,12 +299,12 @@
INSTALL_WHIRL_STUFF () {
INSTALL_EXEC_SUB ${AREA}/whirl2c/whirl2c ${PHASEPATH}/whirl2c
- INSTALL_EXEC_SUB ${AREA}/whirl2f/whirl2f ${PHASEPATH}/whirl2f
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_EXEC_SUB
${AREA}/whirl2f/whirl2f ${PHASEPATH}/whirl2f
INSTALL_EXEC_SUB ${AREA}/whirl2c/whirl2c.so ${PHASEPATH}/whirl2c.so
- INSTALL_EXEC_SUB ${AREA}/whirl2f/whirl2f.so ${PHASEPATH}/whirl2f.so
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_EXEC_SUB
${AREA}/whirl2f/whirl2f.so ${PHASEPATH}/whirl2f.so
(cd ${PHASEPATH}; ln -sf be whirl2c_be)
- (cd ${PHASEPATH}; ln -sf be whirl2f_be)
+ [ "$INSTALL_FORTRAN" = "YES" ] && (cd ${PHASEPATH}; ln -sf be whirl2f_be)
INSTALL_EXEC_SUB ${AREA}/ir_tools/ir_b2a ${BIN_DIR}/ir_b2a
INSTALL_EXEC_SUB ${AREA}/libspin_4_2_0/gspin42 ${BIN_DIR}/gspin42
@@ -318,8 +324,8 @@
LIBAREA="osprey/targdir_lib"
# f90 related archieves
- INSTALL_DATA_SUB ${AREA}/temp_f90libs/lib.cat ${PHASEPATH}/lib.cat
- INSTALL_DATA_SUB ${AREA}/temp_f90libs/lib.exp ${PHASEPATH}/lib.exp
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${AREA}/temp_f90libs/lib.cat ${PHASEPATH}/lib.cat
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${AREA}/temp_f90libs/lib.exp ${PHASEPATH}/lib.exp
# instrument archieves.
INSTALL_DATA_SUB ${LIBAREA}/libcginstr/libcginstr.a
${PHASEPATH}/libcginstr.a
@@ -331,14 +337,14 @@
LIBAREA="osprey/targdir_lib"
LIB32AREA="osprey/targdir_lib2"
# 64bit libraries
- INSTALL_DATA_SUB ${LIBAREA}/libfortran/libfortran.a
${PHASEPATH}/libfortran.a
- INSTALL_DATA_SUB ${LIBAREA}/libu/libffio.a
${PHASEPATH}/libffio.a
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIBAREA}/libfortran/libfortran.a ${PHASEPATH}/libfortran.a
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIBAREA}/libu/libffio.a ${PHASEPATH}/libffio.a
INSTALL_DATA_SUB ${LIBAREA}/libm/libmsgi.a ${PHASEPATH}/libmsgi.a
INSTALL_DATA_SUB ${LIBAREA}/libmv/libmv.a
${PHASEPATH}/libmv.a
INSTALL_DATA_SUB ${LIBAREA}/libopenmp/libopenmp.a
${PHASEPATH}/libopenmp.a
# 32bit libraries
- INSTALL_DATA_SUB ${LIB32AREA}/libfortran/libfortran.a
${PHASEPATH}/32/libfortran.a
- INSTALL_DATA_SUB ${LIB32AREA}/libu/libffio.a
${PHASEPATH}/32/libffio.a
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIB32AREA}/libfortran/libfortran.a ${PHASEPATH}/32/libfortran.a
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIB32AREA}/libu/libffio.a ${PHASEPATH}/32/libffio.a
INSTALL_DATA_SUB ${LIB32AREA}/libm/libmsgi.a
${PHASEPATH}/32/libmsgi.a
INSTALL_DATA_SUB ${LIB32AREA}/libmv/libmv.a
${PHASEPATH}/32/libmv.a
else
@@ -399,8 +405,8 @@
if [ "$TARG_HOST" = "ia64" ] ; then
LIBAREA="osprey/targdir_lib"
- INSTALL_DATA_SUB ${LIBAREA}/libfortran/libfortran.a
${PHASEPATH}/libfortran.a
- INSTALL_DATA_SUB ${LIBAREA}/libu/libffio.a
${PHASEPATH}/libffio.a
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIBAREA}/libfortran/libfortran.a ${PHASEPATH}/libfortran.a
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIBAREA}/libu/libffio.a ${PHASEPATH}/libffio.a
# libmsgi.a is no longer needed
#INSTALL_DATA_SUB ${LIBAREA}/libmsgi/libmsgi.a
${PHASEPATH}/libmsgi.a
INSTALL_DATA_SUB ${LIBAREA}/libmv/libmv.a
${PHASEPATH}/libmv.a
@@ -413,15 +419,15 @@
LIBAREA="osprey/targdir_lib2"
LIB32AREA="osprey/targdir_lib"
# 64bit libraries
- INSTALL_DATA_SUB ${LIBAREA}/libfortran/libfortran.a
${PHASEPATH}/libfortran.a
- INSTALL_DATA_SUB ${LIBAREA}/libfortran/libfortran.so
${PHASEPATH}/libfortran.so
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIBAREA}/libfortran/libfortran.a ${PHASEPATH}/libfortran.a
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIBAREA}/libfortran/libfortran.so ${PHASEPATH}/libfortran.so
# FMODS="IEEE_ARITHMETIC.mod IEEE_EXCEPTIONS.mod IEEE_FEATURES.mod
ISO_C_BINDING.mod ISO_FORTRAN_ENV.mod"
FMODS="ISO_C_BINDING.mod"
for i in $FMODS ; do
- INSTALL_DATA_SUB ${LIBAREA}/libfortran/$i ${PHASEPATH}/$i
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIBAREA}/libfortran/$i ${PHASEPATH}/$i
done
- INSTALL_DATA_SUB ${LIBAREA}/libu/libffio.a
${PHASEPATH}/libffio.a
- INSTALL_DATA_SUB ${LIBAREA}/libu/libffio.so
${PHASEPATH}/libffio.so
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIBAREA}/libu/libffio.a ${PHASEPATH}/libffio.a
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIBAREA}/libu/libffio.so ${PHASEPATH}/libffio.so
#INSTALL_DATA_SUB ${LIBAREA}/libm/libmsgi.a
${PHASEPATH}/libmsgi.a
INSTALL_DATA_SUB ${LIBAREA}/libmv/libmv.a
${PHASEPATH}/libmv.a
INSTALL_DATA_SUB ${LIBAREA}/libmv/libmv.so.1
${PHASEPATH}/libmv.so.1
@@ -430,13 +436,13 @@
INSTALL_DATA_SUB ${LIBAREA}/libacml_mv/libacml_mv.a
${PHASEPATH}/libacml_mv.a
INSTALL_DATA_SUB ${LIBAREA}/libacml_mv/libacml_mv.so.1
${PHASEPATH}/libacml_mv.so.1
# 32bit libraries
- INSTALL_DATA_SUB ${LIB32AREA}/libfortran/libfortran.a
${PHASEPATH}/32/libfortran.a
- INSTALL_DATA_SUB ${LIB32AREA}/libfortran/libfortran.so
${PHASEPATH}/32/libfortran.so
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIB32AREA}/libfortran/libfortran.a ${PHASEPATH}/32/libfortran.a
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIB32AREA}/libfortran/libfortran.so ${PHASEPATH}/32/libfortran.so
for i in $FMODS ; do
- INSTALL_DATA_SUB ${LIB32AREA}/libfortran/$i ${PHASEPATH}/32/$i
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIB32AREA}/libfortran/$i ${PHASEPATH}/32/$i
done
- INSTALL_DATA_SUB ${LIB32AREA}/libu/libffio.a
${PHASEPATH}/32/libffio.a
- INSTALL_DATA_SUB ${LIB32AREA}/libu/libffio.so
${PHASEPATH}/32/libffio.so
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIB32AREA}/libu/libffio.a ${PHASEPATH}/32/libffio.a
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${LIB32AREA}/libu/libffio.so ${PHASEPATH}/32/libffio.so
#INSTALL_DATA_SUB ${LIB32AREA}/libm/libmsgi.a
${PHASEPATH}/32/libmsgi.a
INSTALL_DATA_SUB ${LIB32AREA}/libmv/libmv.a
${PHASEPATH}/32/libmv.a
INSTALL_DATA_SUB ${LIB32AREA}/libmv/libmv.so.1
${PHASEPATH}/32/libmv.so.1
@@ -551,7 +557,7 @@
#INSTALL_DATA_SUB osprey/include/nue/va-ia64.h
${PHASEPATH}/include/va-ia64.h
#cp -f -a osprey/include ${PHASEPATH}/
INSTALL_DATA_SUB ${TOP_SRCDIR}/osprey/include/whirl2c.h
${ROOT}/include/${VERSION}/whirl2c.h
- INSTALL_DATA_SUB ${TOP_SRCDIR}/osprey/include/whirl2f.h
${ROOT}/include/${VERSION}/whirl2f.h
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${TOP_SRCDIR}/osprey/include/whirl2f.h ${ROOT}/include/${VERSION}/whirl2f.h
INSTALL_DATA_SUB ${AREA}/include/dwarf.h
${ROOT}/include/${VERSION}/dwarf.h
INSTALL_DATA_SUB ${AREA}/include/libdwarf.h
${ROOT}/include/${VERSION}/libdwarf.h
@@ -561,7 +567,7 @@
INSTALL_DATA_SUB ${TOP_SRCDIR}/osprey/include/omp/omp.h
${ROOT}/include/${VERSION}/omp.h
INSTALL_DATA_SUB ${TOP_SRCDIR}/osprey/include/omp/omp_lib.h
${ROOT}/include/${VERSION}/omp_lib.h
- INSTALL_DATA_SUB ${TOP_SRCDIR}/osprey/include/omp/omp_lib.f
${ROOT}/include/${VERSION}/omp_lib.f
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB
${TOP_SRCDIR}/osprey/include/omp/omp_lib.f ${ROOT}/include/${VERSION}/omp_lib.f
return 0
}
@@ -572,7 +578,7 @@
d2=$ROOT/usr/man/man1
INSTALL_DATA_SUB $d1/sgicc.1 $d2
- INSTALL_DATA_SUB $d1/sgif90.1 $d2
+ [ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_DATA_SUB $d1/sgif90.1 $d2
(cd $d2; ln -sf sgicc.1 sgiCC.1)
@@ -666,7 +672,7 @@
INSTALL_PREBUILD_GNU_NATIVE_CRT_STARTUP
[ "$INSTALL_TYPE" = "ia64-cross" ] && INSTALL_CROSS_UTIL
INSTALL_PREBUILD_PHASE
-INSTALL_MODULES
+[ "$INSTALL_FORTRAN" = "YES" ] && INSTALL_MODULES
exit 0
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Open64-devel mailing list
Open64-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/open64-devel
