diff options
| author | Damien Doligez <damien.doligez-inria.fr> | 1996-10-07 14:02:45 +0000 |
|---|---|---|
| committer | Damien Doligez <damien.doligez-inria.fr> | 1996-10-07 14:02:45 +0000 |
| commit | ca2c3e4f73d9f54c28f34622703e29b9264ec7e2 (patch) | |
| tree | b9ecf3b5c25db0040b57c7122d7f93ee2e3f6770 | |
| parent | 71c89842cd54ba07d4b1e9e889a87c0bb1cf2596 (diff) | |
| download | ocaml-ca2c3e4f73d9f54c28f34622703e29b9264ec7e2.tar.gz | |
On n'utilise plus cpp du tout.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@1054 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | config/Makefile-templ | 1 | ||||
| -rw-r--r-- | config/Makefile.nt | 3 | ||||
| -rw-r--r-- | config/s-nt.h | 2 | ||||
| -rw-r--r-- | config/s-templ.h | 4 | ||||
| -rwxr-xr-x | configure | 36 |
5 files changed, 24 insertions, 22 deletions
diff --git a/config/Makefile-templ b/config/Makefile-templ index ebefbd9ee5..58abad6623 100644 --- a/config/Makefile-templ +++ b/config/Makefile-templ @@ -49,6 +49,7 @@ SHARPBANGSCRIPTS=true #CCLIBS=-lcurses -ltermcap -lm ### How to invoke the C preprocessor +# This is not needed anymore. Leave these lines commented out. # On most machines: #CPP=/lib/cpp -P # Under Solaris: diff --git a/config/Makefile.nt b/config/Makefile.nt index 1212864052..ba69cfdd39 100644 --- a/config/Makefile.nt +++ b/config/Makefile.nt @@ -26,7 +26,8 @@ BYTECCLINKOPTS=/MT CCLIBS= ### How to invoke the C preprocessor -CPP=cl /nologo /EP +# We don't need it anymore +#CPP=cl /nologo /EP ### How to invoke the librarian MKLIB=lib /nologo /debugtype:CV /out: diff --git a/config/s-nt.h b/config/s-nt.h index 9ccc2a1d10..8f02b893e4 100644 --- a/config/s-nt.h +++ b/config/s-nt.h @@ -13,7 +13,7 @@ /* Operating system dependencies, Intel x86 processors, Windows NT */ -#define OCAML_OS_TYPE "Windows NT" +#define OCAML_OS_TYPE "Win32" #define HAS_MEMMOVE #define BSD_SIGNALS diff --git a/config/s-templ.h b/config/s-templ.h index 29d864b848..efe73cafdf 100644 --- a/config/s-templ.h +++ b/config/s-templ.h @@ -16,8 +16,8 @@ /* 0. Operating system type string. */ #define OCAML_OS_TYPE "Unix" -/* #define OCAML_OS_TYPE "Windows NT" */ -/* #define OCAML_OS_TYPE "Macintosh" */ +/* #define OCAML_OS_TYPE "Win32" */ +/* #define OCAML_OS_TYPE "MacOS" */ /* 1. For the runtime system. */ @@ -240,24 +240,24 @@ echo "ASPP=$aspp" >> Makefile echo "ASPPFLAGS=$asppflags" >> Makefile # Checking how to invoke cpp - -if sh ./searchpath cpp; then - cpp="cpp -P" -elif test -f /lib/cpp; then - cpp="/lib/cpp -P" -elif test -f /usr/ccs/lib/cpp; then - cpp="/usr/ccs/lib/cpp -P" -else - cpp="not found" -fi - -echo "CPP=$cpp" >> Makefile - -echo "How to invoke the C preprocessor: $cpp" - -if test "$cpp" = "not found"; then - echo "(Please edit the generated config/Makefile to set CPP correctly)" -fi +# We don't need cpp anymore +#if sh ./searchpath cpp; then +# cpp="cpp -P" +#elif test -f /lib/cpp; then +# cpp="/lib/cpp -P" +#elif test -f /usr/ccs/lib/cpp; then +# cpp="/usr/ccs/lib/cpp -P" +#else +# cpp="not found" +#fi +# +#echo "CPP=$cpp" >> Makefile +# +#echo "How to invoke the C preprocessor: $cpp" +# +#if test "$cpp" = "not found"; then +# echo "(Please edit the generated config/Makefile to set CPP correctly)" +#fi # Where is ranlib? |