From 8de6e235c426638c4ea598cb042734103b596104 Mon Sep 17 00:00:00 2001 From: daanx Date: Wed, 14 Feb 2024 19:44:06 -0800 Subject: [PATCH] fix VCPKG_ROOT quoting --- src/Compile/CodeGen.hs | 1 + src/Compile/Options.hs | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Compile/CodeGen.hs b/src/Compile/CodeGen.hs index 93f719a1e..7e390944d 100644 --- a/src/Compile/CodeGen.hs +++ b/src/Compile/CodeGen.hs @@ -7,6 +7,7 @@ ----------------------------------------------------------------------------- module Compile.CodeGen ( codeGen, Link, LinkResult(..), noLink ) where +import Debug.Trace import Data.Char import Data.Maybe import Data.List diff --git a/src/Compile/Options.hs b/src/Compile/Options.hs index c17ffa4a7..98aa31498 100644 --- a/src/Compile/Options.hs +++ b/src/Compile/Options.hs @@ -33,7 +33,7 @@ module Compile.Options( -- * Command line options , Terminal(..) ) where - +import Debug.Trace import Data.Char ( toLower, toUpper, isAlpha, isSpace ) import Data.List ( intersperse, isInfixOf ) import Data.Hashable @@ -687,7 +687,6 @@ environment , ("koka_lib_dir", "dir", opt "libdir", "Set the koka compiled library directory (= '/lib/koka/')") , ("koka_share_dir", "dir", opt "sharedir", "Set the koka library sources directory (= '/share/koka/')") , ("koka_build_dir", "dir", opt "builddir", ("Set the default koka build directory (= '" ++ kkbuild ++ "')")) - , ("VCPKG_ROOT" , "dir", opt "vcpkg", "Root directory of the vcpkg installation (= '~/vcpkg')") ] where flagsEnv s = [s] @@ -947,6 +946,7 @@ vcpkgFindRoot :: FilePath -> IO (FilePath,FilePath) vcpkgFindRoot root = if (null root) then do eroot <- getEnvVar "VCPKG_ROOT" + -- trace ("found eroot,root: " ++ show (eroot,root)) $ if (not (null eroot)) then return (eroot, joinPath eroot vcpkgExe) else do homeDir <- getHomeDirectory