config optimized? for cc

Author: wargrey

cc.rkt

@@ -35,12 +35,13 @@
            (c-compiler-candidates compilers))))
 
 (define c-compile : (->* (Path-String Path-String)
-                         (#:standard (Option CC-Standard-Version) #:cpp? Boolean #:verbose? Boolean #:debug? Boolean
-                          #:includes (Listof C-Toolchain-Path-String) #:macros (Listof C-Compiler-Macro)
-                          #:compilers (Option (Listof Symbol)))
+                         (#:standard (Option CC-Standard-Version) #:compilers (Option (Listof Symbol))
+                          #:cpp? Boolean #:verbose? Boolean #:debug? Boolean #:optimize? Boolean
+                          #:includes (Listof C-Toolchain-Path-String) #:macros (Listof C-Compiler-Macro))
                          Void)
-  (lambda [#:standard [std #false] #:cpp? [cpp? #false] #:verbose? [verbose? #false] #:debug? [debug? #false]
-           #:includes [includes null] #:macros [macros null] #:compilers [compilers #false]
+  (lambda [#:standard [std #false] #:compilers [compilers #false] #:cpp? [cpp? #false]
+           #:verbose? [verbose? #false] #:debug? [debug? #false] #:optimize? [optimize? #true]
+           #:includes [includes null] #:macros [macros null]
            infile outfile]
     (define compiler : (Option CC) (c-pick-compiler compilers))
 
@@ -64,7 +65,7 @@
                      [else (or (force cc++) cc)])))
      (for/list : (Listof (Listof String)) ([layout (in-list (toolchain-option-layout compiler))])
        (case layout
-         [(flags) ((cc-flags compiler) digimon-system cpp? std verbose? debug?)]
+         [(flags) ((cc-flags compiler) digimon-system cpp? std verbose? debug? optimize?)]
          [(macros) ((cc-macros compiler) (cc-default-macros digimon-system cpp? debug?) digimon-system cpp? all-Ds)]
          [(includes) (remove-duplicates ((cc-includes compiler) (c-path-flatten includes) digimon-system cpp?))]
          [(infile) ((cc-infile compiler) infile digimon-system cpp?)]

digitama/toolchain/bin/clang.rkt

@@ -21,9 +21,9 @@
                  extra-macros))))
 
 (define clang-compile-flags : CC-Flags
-  (lambda [system cpp? std verbose? debug?]
+  (lambda [system cpp? std verbose? debug? optimize?]
     (append (list "-c" "-fPIC" "-Wall")
-            (if (not debug?) (list "-O2") (list "-Og" "-g"))
+            (if (not debug?) (if (not optimize?) null (list "-O2")) (list "-Og" "-g"))
             (cond [(not cpp?) (list "-x" "c" (clang-stdc->string std))]
                   [else (list "-x" "c++" (clang-stdcpp->string std))])
             (case system

digitama/toolchain/bin/gcc.rkt

@@ -9,14 +9,14 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (define gcc-compile-flags : CC-Flags
-  (lambda [system cpp? std verbose? debug?]
-    (cond [(eq? system 'macosx) (clang-compile-flags system cpp? std verbose? debug?)]
+  (lambda [system cpp? std verbose? debug? optimize?]
+    (cond [(eq? system 'macosx) (clang-compile-flags system cpp? std verbose? debug? optimize?)]
           [else (append (list "-c" "-fPIC" "-Wall")
 
                         ; doesn't work...
                         (list "-finput-charset=UTF-8" "-fextended-identifiers" "-fexec-charset=UTF-8")
 
-                        (if (not debug?) (list "-O2") (list "-Og" "-g"))
+                        (if (not debug?) (if (not optimize?) null (list "-O2")) (list "-Og" "-g"))
                         (cond [(not cpp?) (list "-x" "c" (clang-stdc->string std))]
                               [else (list "-x" "c++" (clang-stdcpp->string std))])
                         (case system

digitama/toolchain/bin/msvc.rkt

@@ -26,12 +26,12 @@
                  extra-macros))))
 
 (define msvc-compile-flags : CC-Flags
-  (lambda [system cpp? std verbose? debug?]
+  (lambda [system cpp? std verbose? debug? optimize?]
     (append (list "/nologo" "/FC" "/c" ; compiling only, no link
                   #;"/constexpr"
                   "/EHsc" "/W3" "/sdl" ; security features and warnings
                   "/utf-8")
-            (if (not debug?) (list "/O2") (list "/Od" "/ZI" "/JMC"))
+            (if (not debug?) (if (not optimize?) null (list "/O2")) (list "/Od" "/ZI" "/JMC"))
             (if (not cpp?) (list "/TC" (msvc-stdc->string std)) (list "/TP" (msvc-stdcpp->string std)))
             (if (not verbose?) null (list "/showIncludes")))))
 

digitama/toolchain/cc/compiler.rkt

@@ -15,7 +15,7 @@
 (define-type CC-Options (U 'flags 'macros 'includes 'infile 'outfile))
 
 (define-type CC-CPP-Macros (-> CC-Macros Symbol Boolean CC-Macros (Listof String)))
-(define-type CC-Flags (-> Symbol Boolean (Option CC-Standard-Version) Boolean Boolean (Listof String)))
+(define-type CC-Flags (-> Symbol Boolean (Option CC-Standard-Version) Boolean Boolean Boolean (Listof String)))
 (define-type CC-Includes (-> (Listof Path) Symbol Boolean (Listof String)))
 
 (define-type CC-IO-File-Flag (-> Path-String Symbol Boolean (Listof String)))