diff options
| author | Brad Richardson <brichardson@structint.com> | 2020-06-14 19:45:06 -0700 |
|---|---|---|
| committer | Brad Richardson <brichardson@structint.com> | 2020-06-14 19:45:06 -0700 |
| commit | ac01e266362251ba6c10443aeacf2e13061e4a05 (patch) | |
| tree | 108b95cd4a82dce23d60c2eed628c367ee2df155 /src | |
| parent | 91a649cdd80bf1062a03bcbc58715789ae0d3422 (diff) | |
| download | fpm-ac01e266362251ba6c10443aeacf2e13061e4a05.tar.gz fpm-ac01e266362251ba6c10443aeacf2e13061e4a05.zip | |
Revert "Try escaping the colon in buildscript BUILD_DIR"
This reverts commit 91a649cdd80bf1062a03bcbc58715789ae0d3422.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Build.hs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/Build.hs b/src/Build.hs index 96b58ab..ce1f161 100644 --- a/src/Build.hs +++ b/src/Build.hs @@ -15,7 +15,6 @@ import Data.Char ( isAsciiLower import Data.List ( intercalate , isSuffixOf ) -import Data.List.Utils (replace) import qualified Data.Map as Map import Data.Maybe ( fromMaybe , mapMaybe @@ -386,7 +385,7 @@ buildWithScript script projectDirectory buildDirectory compiler flags libraryNam absoluteLibraryDirectories <- mapM makeAbsolute otherLibraryDirectories setEnv "FC" compiler setEnv "FFLAGS" (intercalate " " flags) - setEnv "BUILD_DIR" (escapeColon absoluteBuildDirectory) + setEnv "BUILD_DIR" absoluteBuildDirectory setEnv "INCLUDE_DIRS" (intercalate " " absoluteLibraryDirectories) let archiveFile = absoluteBuildDirectory </> "lib" ++ libraryName <.> "a" withCurrentDirectory @@ -402,6 +401,3 @@ isMakefile script | script == "Makefile" = True | script == "makefile" = True | ".mk" `isSuffixOf` script = True | otherwise = False - -escapeColon :: String -> String -escapeColon = replace ":" "\\:" |