[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetC ChangeLog,1.29,1.30 config.sub,1.1.1.1
From: |
Rhys Weatherley <address@hidden> |
Subject: |
[Dotgnu-pnet-commits] CVS: pnetC ChangeLog,1.29,1.30 config.sub,1.1.1.1,1.2 configure.in,1.21,1.22 |
Date: |
Thu, 03 Jul 2003 06:20:00 -0400 |
Update of /cvsroot/dotgnu-pnet/pnetC
In directory subversions:/tmp/cvs-serv8853
Modified Files:
ChangeLog config.sub configure.in
Log Message:
Modify the autoconf system so that cscc is properly detected as
a cross-compiler by pre-loading the host and target values; work
around spaces in pathnames under Cygwin.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetC/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** ChangeLog 30 Jun 2003 11:41:52 -0000 1.29
--- ChangeLog 3 Jul 2003 10:19:57 -0000 1.30
***************
*** 1,3 ****
--- 1,9 ----
+ 2003-07-03 Rhys Weatherley <address@hidden>
+
+ * configure.in, config.sub: modify the autoconf system so that
+ cscc is properly detected as a cross-compiler by pre-loading the
+ host and target values; work around spaces in pathnames under Cygwin.
+
2003-06-30 Rhys Weatherley <address@hidden>
Index: config.sub
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetC/config.sub,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** config.sub 16 Aug 2002 03:19:43 -0000 1.1.1.1
--- config.sub 3 Jul 2003 10:19:57 -0000 1.2
***************
*** 881,884 ****
--- 881,888 ----
os=-coff
;;
+ cli)
+ basic_machine=cli-unknown
+ os=-none
+ ;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\'
not recognized 1>&2
Index: configure.in
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetC/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** configure.in 28 Jun 2003 09:53:37 -0000 1.21
--- configure.in 3 Jul 2003 10:19:57 -0000 1.22
***************
*** 2,5 ****
--- 2,28 ----
AC_INIT(include/stdarg.h)
+ dnl Force the configure script to think that the target is "cli".
+ dnl The full name is "cli-unknown-none": "unknown-none" means that the
+ dnl resulting binaries will work for all vendors and operating systems
+ dnl that have cli's, which is what we want to happen.
+ if test "x$as_expr" = "x" ; then
+ dnl Old-style autoconf where --host == --build
+ target=cli-unknown
+ target_alias=cli-unknown
+ cross_compiling=yes
+ ac_cv_prog_cc_cross=yes
+ else
+ dnl New-style autoconf where --host == --target
+ host=cli-unknown-none
+ host_alias=cli-unknown
+ target=cli-unknown-none
+ target_alias=cli-unknown
+ ac_tool_prefix=cli-unknown-
+ ac_cv_host=$host
+ ac_cv_target=$target
+ cross_compiling=yes
+ ac_cv_prog_cc_cross=yes
+ fi
+
dnl Determine the build, host, and target system types.
AC_CANONICAL_SYSTEM
***************
*** 18,30 ****
if test -n "$withval"; then
case "$withval" in
! ../*) PNET_PATH="`pwd`/$withval" ;;
! *) PNET_PATH="$withval" ;;
esac
else
PNET_PATH="`pwd`/../pnet"
fi
],
[
PNET_PATH="`pwd`/../pnet"
])
--- 41,57 ----
if test -n "$withval"; then
case "$withval" in
! ../*) PNET_PATH="`pwd`/$withval"
! PNET_CHECK_PATH="$withval" ;;
! *) PNET_PATH="$withval"
! PNET_CHECK_PATH="$withval" ;;
esac
else
PNET_PATH="`pwd`/../pnet"
+ PNET_CHECK_PATH="../pnet"
fi
],
[
PNET_PATH="`pwd`/../pnet"
+ PNET_CHECK_PATH="../pnet"
])
***************
*** 39,51 ****
if test -n "$withval"; then
case "$withval" in
! ../*) PNETLIB_PATH="`pwd`/$withval" ;;
! *) PNETLIB_PATH="$withval" ;;
esac
else
PNETLIB_PATH="`pwd`/../pnetlib"
fi
],
[
PNETLIB_PATH="`pwd`/../pnetlib"
])
--- 66,82 ----
if test -n "$withval"; then
case "$withval" in
! ../*) PNETLIB_PATH="`pwd`/$withval"
! PNETLIB_CHECK_PATH="$withval" ;;
! *) PNETLIB_PATH="$withval"
! PNETLIB_CHECK_PATH="$withval" ;;
esac
else
PNETLIB_PATH="`pwd`/../pnetlib"
+ PNETLIB_CHECK_PATH="../pnetlib"
fi
],
[
PNETLIB_PATH="`pwd`/../pnetlib"
+ PNETLIB_CHECK_PATH="../pnetlib"
])
***************
*** 64,71 ****
dnl Find the location of the "cscc" compiler.
! AC_PATH_PROG(CSCC, cscc,, ${PNET_PATH}/cscc:${prefix}/bin:$PATH)
if test -z "$CSCC" ; then
AC_MSG_ERROR([Portable.NET's C compiler, cscc, is required to build.])
fi
dnl Find the location of the "ilrun" runtime engine.
--- 95,106 ----
dnl Find the location of the "cscc" compiler.
! AC_PATH_PROG(CSCC, cscc,, ${PNET_CHECK_PATH}/cscc:${prefix}/bin:$PATH)
if test -z "$CSCC" ; then
AC_MSG_ERROR([Portable.NET's C compiler, cscc, is required to build.])
fi
+ case "$CSCC" in
+ ../*) CSCC_REAL="${PNET_PATH}/cscc/cscc" ;;
+ *) CSCC_REAL="$CSCC" ;;
+ esac
dnl Find the location of the "ilrun" runtime engine.
***************
*** 73,88 ****
dnl Determine additional flags that we need to force "cscc" to act sane.
CFLAGS="-x c $EXTRA_CFLAGS"
! if test -x "$PNET_PATH/cscc/cscc-c-s" ; then
! CFLAGS="$CFLAGS -fplugin-c-path=$PNET_PATH/cscc/cscc-c-s"
fi
! if test -x "$PNET_PATH/cscc/cscc-cs" ; then
! CFLAGS="$CFLAGS -fplugin-cs-path=$PNET_PATH/cscc/cscc-cs"
fi
! if test -f "$PNETLIB_PATH/csupport/OpenSystem.C.dll" ; then
! CFLAGS="$CFLAGS -L$PNETLIB_PATH/csupport"
fi
! if test -f "$PNETLIB_PATH/runtime/mscorlib.dll" ; then
! CFLAGS="$CFLAGS -L$PNETLIB_PATH/runtime"
fi
--- 108,125 ----
dnl Determine additional flags that we need to force "cscc" to act sane.
+ dnl We use slightly different paths than the final to prevent strange
+ dnl problems with spaces in pathnames under Cygwin.
CFLAGS="-x c $EXTRA_CFLAGS"
! if test -x "$PNET_CHECK_PATH/cscc/cscc-c-s" ; then
! CFLAGS="$CFLAGS -fplugin-c-path=$PNET_CHECK_PATH/cscc/cscc-c-s"
fi
! if test -x "$PNET_CHECK_PATH/cscc/cscc-cs" ; then
! CFLAGS="$CFLAGS -fplugin-cs-path=$PNET_CHECK_PATH/cscc/cscc-cs"
fi
! if test -f "$PNETLIB_CHECK_PATH/csupport/OpenSystem.C.dll" ; then
! CFLAGS="$CFLAGS -L$PNETLIB_CHECK_PATH/csupport"
fi
! if test -f "$PNETLIB_CHECK_PATH/runtime/mscorlib.dll" ; then
! CFLAGS="$CFLAGS -L$PNETLIB_CHECK_PATH/runtime"
fi
***************
*** 115,118 ****
--- 152,172 ----
AC_EXEEXT
AC_OBJEXT
+
+ dnl Set up the final CC, CSCC, and CFLAGS values for the Makefile's.
+ CC="\"$CSCC_REAL\""
+ CSCC="\"$CSCC_REAL\""
+ CFLAGS="-x c $EXTRA_CFLAGS"
+ if test -x "$PNET_PATH/cscc/cscc-c-s" ; then
+ CFLAGS="$CFLAGS \"-fplugin-c-path=$PNET_PATH/cscc/cscc-c-s\""
+ fi
+ if test -x "$PNET_PATH/cscc/cscc-cs" ; then
+ CFLAGS="$CFLAGS \"-fplugin-cs-path=$PNET_PATH/cscc/cscc-cs\""
+ fi
+ if test -f "$PNETLIB_PATH/csupport/OpenSystem.C.dll" ; then
+ CFLAGS="$CFLAGS \"-L$PNETLIB_PATH/csupport\""
+ fi
+ if test -f "$PNETLIB_PATH/runtime/mscorlib.dll" ; then
+ CFLAGS="$CFLAGS \"-L$PNETLIB_PATH/runtime\""
+ fi
AC_OUTPUT([
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetC ChangeLog,1.29,1.30 config.sub,1.1.1.1,1.2 configure.in,1.21,1.22,
Rhys Weatherley <address@hidden> <=