setup.py: Enable assert() statements, and reduce optimization when debugging

1 files changed, 19 insertions, 8 deletions

diff --git a/setup.py b/setup.py
index 4cdbd29..b0f95a7 100644
--- a/setup.py
+++ b/setup.py
@@ -115,14 +115,25 @@ class PCTBuildExt (build_ext):
         # Detect which modules should be compiled
         self.detect_modules()
 
-        # Speed up execution by tweaking compiler options.  This especially
-        # helps the DES modules.
-        if not self.debug and self.compiler.compiler_type in ('unix', 'cygwin', 'mingw32'):
-            self.__remove_compiler_option("-g")
-            self.__remove_compiler_option("-O")
-            self.__remove_compiler_option("-O2")
-            self.__add_compiler_option("-O3")
-            self.__add_compiler_option("-fomit-frame-pointer")
+        # Tweak compiler options
+        if self.compiler.compiler_type in ('unix', 'cygwin', 'mingw32'):
+            # Make assert() statements always work
+            self.__remove_compiler_option("-DNDEBUG")
+
+            # Choose our own optimization options
+            for opt in ["-O", "-O0", "-O1", "-O2", "-O3", "-Os"]:
+                self.__remove_compiler_option(opt)
+            if self.debug:
+                # Basic optimization is still needed when debugging to compile
+                # the libtomcrypt code.
+                self.__add_compiler_option("-O")
+            else:
+                # Speed up execution by tweaking compiler options.  This
+                # especially helps the DES modules.
+                self.__add_compiler_option("-O3")
+                self.__add_compiler_option("-fomit-frame-pointer")
+                # Don't include debug symbols unless debugging
+                self.__remove_compiler_option("-g")
 
         # Call the superclass's build_extensions method
         build_ext.build_extensions(self)