--- a/CMakeLists.txt	Mon Dec 14 20:23:51 2009 +0000
+++ b/CMakeLists.txt	Wed Dec 16 14:58:45 2009 +0000
@@ -47,9 +47,6 @@
 		else()
 			set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400")
 		endif()
-	ELSEIF(NOT CMAKE_OSX_ARCHITECTURES)
-		EXEC_PROGRAM("/usr/bin/uname" ARGS "-p" OUTPUT_VARIABLE ARCH_TYPE)
-		set(CMAKE_OSX_ARCHITECTURES "${ARCH_TYPE}")
 	ENDIF()	
 
 	message(STATUS "Target system: Mac OS X ${minimum_macosx} ${CMAKE_OSX_ARCHITECTURES}")	
@@ -98,7 +95,7 @@
 endif(LOWRES)
 
 if(Optz)
-	set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" ${pascal_compiler_flags_cmn})
+	set(pascal_compiler_flags_cmn "-O2" "-Xs" "-Si" "-Or" ${pascal_compiler_flags_cmn})
 	set(haskell_compiler_flags_cmn "-w" "-O2")
 else(Optz)
 	set(pascal_compiler_flags_cmn "-O-" "-gl" "-dDEBUGFILE" "-pg" "-vv" ${pascal_compiler_flags_cmn})