summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2001-02-22 03:37:29 +0000
committerJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2001-02-22 03:37:29 +0000
commit770b5de3e773124f8cbdd606659d6e5481b365cc (patch)
treea7f4443c3b8ed56e2bfd040d3252a320275f0df8 /configure
parent4f782171df639316093ab26debbb9a77e7daa123 (diff)
assembler problems on Solaris
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@3434 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure8
1 files changed, 7 insertions, 1 deletions
diff --git a/configure b/configure
index 38e4dd0c4..07c165d22 100755
--- a/configure
+++ b/configure
@@ -14,6 +14,7 @@
# $Id$
+configure_options=$*
prefix=/usr/local
bindir=''
libdir=''
@@ -101,6 +102,10 @@ cd config/auto-aux
rm -f s.h m.h Makefile
touch s.h m.h Makefile
+# Write options to Makefile
+
+echo "# generated by ./configure $configure_options" >> Makefile
+
# Where to install
echo "PREFIX=$prefix" >> Makefile
@@ -426,7 +431,8 @@ case "$arch,$model,$system" in
*) asppflags='-P -DSYS_$(SYSTEM)';;
esac;;
i386,*,solaris) case "$cc" in
- gcc*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
+ # Intel/solaris assembler doesn't like GNU cpp output
+ # gcc*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;
*) asppflags='-P -DSYS_$(SYSTEM)';;
esac;;
i386,*,*) aspp='gcc'; asppflags='-c -DSYS_$(SYSTEM)';;