From 5cb18915d8622fc50bf139382d958a39797845a4 Mon Sep 17 00:00:00 2001
From: Brad Richardson <everythingfunctional@protonmail.com>
Date: Wed, 9 Dec 2020 14:51:33 -0600
Subject: fix(bootstrap-ifort): make adjustments for ifort's picky command line

---
 bootstrap/src/Build.hs |  4 ++--
 bootstrap/src/Fpm.hs   | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'bootstrap')

diff --git a/bootstrap/src/Build.hs b/bootstrap/src/Build.hs
index 8caf0c9..724a1c6 100644
--- a/bootstrap/src/Build.hs
+++ b/bootstrap/src/Build.hs
@@ -108,7 +108,7 @@ buildProgram programDirectory' libraryDirectories sourceExtensions buildDirector
                 in  fileMatcher &?> \(objectFile : _) -> do
                       need (sourceFile : directDependencies)
                       cmd compiler
-                          ["-c", moduleFlag ++ buildDirectory]
+                          ["-c", moduleFlag, buildDirectory]
                           includeFlags
                           flags
                           ["-o", objectFile, sourceFile]
@@ -160,7 +160,7 @@ buildLibrary libraryDirectory sourceExtensions buildDirectory (CompilerSettings
                 in  fileMatcher &?> \(objectFile : _) -> do
                       need (sourceFile : directDependencies)
                       cmd compiler
-                          ["-c", moduleFlag ++ buildDirectory]
+                          ["-c", moduleFlag, buildDirectory]
                           includeFlags
                           flags
                           ["-o", objectFile, sourceFile]
diff --git a/bootstrap/src/Fpm.hs b/bootstrap/src/Fpm.hs
index 294c77d..d647a10 100644
--- a/bootstrap/src/Fpm.hs
+++ b/bootstrap/src/Fpm.hs
@@ -745,24 +745,24 @@ defineCompilerSettings specifiedFlags compiler release
   = let flags = case specifiedFlags of
           [] -> if release
             then
-              [ "-fp-model precise"
-              , "-pc 64"
-              , "-align all"
+              [ "-fp-model", "precise"
+              , "-pc", "64"
+              , "-align", "all"
               , "-coarray"
-              , "-error-limit 1"
-              , "-reentrancy threaded"
+              , "-error-limit", "1"
+              , "-reentrancy", "threaded"
               , "-nogen-interfaces"
-              , "-assume byterecl"
-              , "-assume nounderscore"
+              , "-assume", "byterecl"
+              , "-assume", "nounderscore"
               ]
             else
-              [ "-warn all"
+              [ "-warn", "all"
               , "-check:all:noarg_temp_created"
               , "-coarray"
-              , "-error-limit 1"
+              , "-error-limit", "1"
               , "-O0"
               , "-g"
-              , "-assume byterecl"
+              , "-assume", "byterecl"
               , "-traceback"
               ]
           fs -> fs
-- 
cgit v1.2.3