From e28cbcd8bbb9a5730b370fad7d974c460132554a Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 5 Mar 2011 14:48:25 +0000 Subject: Avoid some shell calls in the build system The DEP_INCLUDE_DIRS and DEP_LIB_DIRS variables always contain single-quote dirs, so we can use e.g. $(subst $(space)',$(space)-L',$(space)$($1_$2_DEP_LIB_DIRS_SINGLE_QUOTED)) to add -L to the front of each dir. I've appended "_SINGLE_QUOTED" to the variable names so we don't accidentally add bare directories to them. --- utils/ghc-cabal/Main.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'utils/ghc-cabal') diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index d75696fa2c..02c41db137 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -371,9 +371,9 @@ generate config_args distdir directory variablePrefix ++ "_CC_OPTS = " ++ unwords (ccOptions bi), variablePrefix ++ "_CPP_OPTS = " ++ unwords (cppOptions bi), variablePrefix ++ "_LD_OPTS = " ++ unwords (ldOptions bi), - variablePrefix ++ "_DEP_INCLUDE_DIRS = " ++ unwords (wrap $ forDeps Installed.includeDirs), + variablePrefix ++ "_DEP_INCLUDE_DIRS_SINGLE_QUOTED = " ++ unwords (wrap $ forDeps Installed.includeDirs), variablePrefix ++ "_DEP_CC_OPTS = " ++ unwords (forDeps Installed.ccOptions), - variablePrefix ++ "_DEP_LIB_DIRS = " ++ unwords (wrap $ forDeps Installed.libraryDirs), + variablePrefix ++ "_DEP_LIB_DIRS_SINGLE_QUOTED = " ++ unwords (wrap $ forDeps Installed.libraryDirs), variablePrefix ++ "_DEP_EXTRA_LIBS = " ++ unwords (forDeps Installed.extraLibraries), variablePrefix ++ "_DEP_LD_OPTS = " ++ unwords (forDeps Installed.ldOptions), variablePrefix ++ "_BUILD_GHCI_LIB = " ++ boolToYesNo (withGHCiLib lbi), -- cgit v1.2.1