summaryrefslogtreecommitdiff
blob: 74bce21ce0afcd8eec2874115a0c5c5010b57069 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
--- mercury-compiler-0.12.2.orig/scripts/mgnuc.in	2005-08-18 17:45:26.000000000 +1200
+++ mercury-compiler-0.12.2/scripts/mgnuc.in	2006-03-11 19:26:54.000000000 +1300
@@ -52,7 +52,7 @@
 # -Wenum-clash 		is for C++ only
 # -Wunused		causes various spurious warnings
 
-	OPT_OPTS="-O2 $CFLAGS_FOR_NO_STRICT_ALIASING -fomit-frame-pointer"
+	OPT_OPTS="@CFLAGS_FOR_OPT@"
 	DEBUG_OPT="-g"
 	COMPILER=gcc
 	;;
--- mercury-compiler-0.12.2.orig/configure	2006-01-25 17:24:01.000000000 +1300
+++ mercury-compiler-0.12.2/configure	2006-03-11 19:18:59.000000000 +1300
@@ -3620,7 +3620,7 @@
 # the `-lc' and `-lg' libraries have different contents; specifically,
 # only the latter contains memalign().  We need to make sure that the
 # test for memalign() doesn't use `-g', since `ml' doesn't use `-g'.
-CFLAGS="-O"
+# CFLAGS="-O"
 
 # we also need to add the appropriate `-I' options so that the test programs
 # can #include various Mercury runtime headers.
@@ -9808,7 +9808,7 @@
 		# enable, and why, see scripts/mgnuc.in.
 		CFLAGS_FOR_WARNINGS="-Wall -Wwrite-strings -Wshadow -Wmissing-prototypes -Wno-unused -Wno-uninitialized -Wstrict-prototypes"
 
-		CFLAGS_FOR_OPT="-O2 -fomit-frame-pointer"
+		CFLAGS_FOR_OPT="$CFLAGS"
 		CFLAGS_FOR_DEBUG="-g"
 		MCFLAGS_FOR_CC=
 		;;