Commit ca2debb2 authored by pcapriotti's avatar pcapriotti
Browse files

Rename package-conf flags to package-db.

Rename package database flags in both GHC and ghc-pkg so that they are
consistent with Cabal nomenclature.

Add a version check to the build system so that the correct set of
package db flags are used when the bootstrapping GHC has version < 7.5.
parent 6a831be4
...@@ -1808,7 +1808,7 @@ AC_MSG_NOTICE(Building in-tree ghc-pwd) ...@@ -1808,7 +1808,7 @@ AC_MSG_NOTICE(Building in-tree ghc-pwd)
dnl except we don't want to have to know what make is called. Sigh. dnl except we don't want to have to know what make is called. Sigh.
rm -rf utils/ghc-pwd/dist-boot rm -rf utils/ghc-pwd/dist-boot
mkdir utils/ghc-pwd/dist-boot mkdir utils/ghc-pwd/dist-boot
if ! "$WithGhc" -v0 -no-user-package-conf -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd if ! "$WithGhc" -v0 -no-user-$GHC_PACKAGE_DB_FLAG -hidir utils/ghc-pwd/dist-boot -odir utils/ghc-pwd/dist-boot -stubdir utils/ghc-pwd/dist-boot --make utils/ghc-pwd/Main.hs -o utils/ghc-pwd/dist-boot/ghc-pwd
then then
AC_MSG_ERROR([Building ghc-pwd failed]) AC_MSG_ERROR([Building ghc-pwd failed])
fi fi
......
...@@ -48,8 +48,8 @@ endif ...@@ -48,8 +48,8 @@ endif
$(BIN_DIST_INST_DIR)/bin/ghc --make HelloWorld $(BIN_DIST_INST_DIR)/bin/ghc --make HelloWorld
./HelloWorld > output ./HelloWorld > output
$(CONTEXT_DIFF) output expected_output $(CONTEXT_DIFF) output expected_output
# Without --no-user-package-conf we might pick up random packages from ~/.ghc # Without --no-user-package-db we might pick up random packages from ~/.ghc
$(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-conf $(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-db
clean distclean: clean distclean:
"$(RM)" $(RM_OPTS_REC) $(BIN_DIST_INST_SUBDIR) "$(RM)" $(RM_OPTS_REC) $(BIN_DIST_INST_SUBDIR)
......
...@@ -48,8 +48,8 @@ endif ...@@ -48,8 +48,8 @@ endif
$(BIN_DIST_INST_DIR)/bin/ghc --make bindisttest/HelloWorld $(BIN_DIST_INST_DIR)/bin/ghc --make bindisttest/HelloWorld
bindisttest/HelloWorld > bindisttest/output bindisttest/HelloWorld > bindisttest/output
$(CONTEXT_DIFF) bindisttest/output bindisttest/expected_output $(CONTEXT_DIFF) bindisttest/output bindisttest/expected_output
# Without --no-user-package-conf we might pick up random packages from ~/.ghc # Without --no-user-package-db we might pick up random packages from ~/.ghc
$(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-conf $(BIN_DIST_INST_DIR)/bin/ghc-pkg check --no-user-package-db
$(eval $(call clean-target,bindisttest,all,$(BIN_DIST_INST_DIR) $(wildcard bindisttest/a/b/c/*) bindisttest/HelloWorld bindisttest/HelloWorld.o bindisttest/HelloWorld.hi bindisttest/output)) $(eval $(call clean-target,bindisttest,all,$(BIN_DIST_INST_DIR) $(wildcard bindisttest/a/b/c/*) bindisttest/HelloWorld bindisttest/HelloWorld.o bindisttest/HelloWorld.hi bindisttest/output))
...@@ -551,7 +551,7 @@ data DynFlags = DynFlags { ...@@ -551,7 +551,7 @@ data DynFlags = DynFlags {
-- Package flags -- Package flags
extraPkgConfs :: [PkgConfRef], extraPkgConfs :: [PkgConfRef],
-- ^ The @-package-conf@ flags given on the command line, in the order -- ^ The @-package-db@ flags given on the command line, in the order
-- they appeared. -- they appeared.
packageFlags :: [PackageFlag], packageFlags :: [PackageFlag],
...@@ -1342,7 +1342,7 @@ parseDynamicFlagsCmdLine :: Monad m => ...@@ -1342,7 +1342,7 @@ parseDynamicFlagsCmdLine :: Monad m =>
parseDynamicFlagsCmdLine dflags args = parseDynamicFlags dflags args True parseDynamicFlagsCmdLine dflags args = parseDynamicFlags dflags args True
-- | Like 'parseDynamicFlagsCmdLine' but does not allow the package flags -- | Like 'parseDynamicFlagsCmdLine' but does not allow the package flags
-- (-package, -hide-package, -ignore-package, -hide-all-packages, -package-conf). -- (-package, -hide-package, -ignore-package, -hide-all-packages, -package-db).
-- Used to parse flags set in a modules pragma. -- Used to parse flags set in a modules pragma.
parseDynamicFilePragma :: Monad m => parseDynamicFilePragma :: Monad m =>
DynFlags -> [Located String] DynFlags -> [Located String]
...@@ -1757,12 +1757,12 @@ dynamic_flags = [ ...@@ -1757,12 +1757,12 @@ dynamic_flags = [
package_flags :: [Flag (CmdLineP DynFlags)] package_flags :: [Flag (CmdLineP DynFlags)]
package_flags = [ package_flags = [
------- Packages ---------------------------------------------------- ------- Packages ----------------------------------------------------
Flag "package-conf" (HasArg (extraPkgConf_ . PkgConfFile)) Flag "package-db" (HasArg (extraPkgConf_ . PkgConfFile))
, Flag "clear-package-conf" (NoArg clearPkgConf) , Flag "clear-package-db" (NoArg clearPkgConf)
, Flag "no-global-package-conf" (NoArg (unSetDynFlag Opt_ReadGlobalPackageConf)) , Flag "no-global-package-db" (NoArg (unSetDynFlag Opt_ReadGlobalPackageConf))
, Flag "no-user-package-conf" (NoArg (unSetDynFlag Opt_ReadUserPackageConf)) , Flag "no-user-package-db" (NoArg (unSetDynFlag Opt_ReadUserPackageConf))
, Flag "global-package-conf" (NoArg (extraPkgConf_ GlobalPkgConf)) , Flag "global-package-db" (NoArg (extraPkgConf_ GlobalPkgConf))
, Flag "user-package-conf" (NoArg (extraPkgConf_ UserPkgConf)) , Flag "user-package-db" (NoArg (extraPkgConf_ UserPkgConf))
, Flag "package-name" (hasArg setPackageName) , Flag "package-name" (hasArg setPackageName)
, Flag "package-id" (HasArg exposePackageId) , Flag "package-id" (HasArg exposePackageId)
......
...@@ -184,10 +184,10 @@ initPackages dflags = do ...@@ -184,10 +184,10 @@ initPackages dflags = do
readPackageConfigs :: DynFlags -> IO [PackageConfig] readPackageConfigs :: DynFlags -> IO [PackageConfig]
readPackageConfigs dflags = do readPackageConfigs dflags = do
let -- Read global package db, unless the -no-user-package-conf flag was given let -- Read global package db, unless the -no-user-package-db flag was given
global_conf_refs = [GlobalPkgConf | dopt Opt_ReadGlobalPackageConf dflags] global_conf_refs = [GlobalPkgConf | dopt Opt_ReadGlobalPackageConf dflags]
-- Read user's package conf (eg. ~/.ghc/i386-linux-6.3/package.conf) -- Read user's package conf (eg. ~/.ghc/i386-linux-6.3/package.conf)
-- unless the -no-user-package-conf flag was given. -- unless the -no-user-package-db flag was given.
user_conf_refs = [UserPkgConf | dopt Opt_ReadUserPackageConf dflags] user_conf_refs = [UserPkgConf | dopt Opt_ReadUserPackageConf dflags]
system_conf_refs = global_conf_refs ++ user_conf_refs system_conf_refs = global_conf_refs ++ user_conf_refs
......
...@@ -161,6 +161,10 @@ if test "$BootingFromHc" = "NO"; then ...@@ -161,6 +161,10 @@ if test "$BootingFromHc" = "NO"; then
or --with-ghc to specify a different GHC to use.]) or --with-ghc to specify a different GHC to use.])
fi fi
fi fi
GHC_PACKAGE_DB_FLAG=package-db
FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[7.5],GHC_PACKAGE_DB_FLAG=package-conf)
AC_SUBST(GHC_PACKAGE_DB_FLAG)
fi; fi;
# GHC is passed to Cabal, so we need a native path # GHC is passed to Cabal, so we need a native path
......
...@@ -899,7 +899,7 @@ install_packages: rts/package.conf.install ...@@ -899,7 +899,7 @@ install_packages: rts/package.conf.install
$(call INSTALL_DIR,"$(DESTDIR)$(topdir)") $(call INSTALL_DIR,"$(DESTDIR)$(topdir)")
$(call removeTrees,"$(INSTALLED_PACKAGE_CONF)") $(call removeTrees,"$(INSTALLED_PACKAGE_CONF)")
$(call INSTALL_DIR,"$(INSTALLED_PACKAGE_CONF)") $(call INSTALL_DIR,"$(INSTALLED_PACKAGE_CONF)")
"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install "$(INSTALLED_GHC_PKG_REAL)" --force --global-package-db "$(INSTALLED_PACKAGE_CONF)" update rts/package.conf.install
$(foreach p, $(INSTALLED_PKG_DIRS), \ $(foreach p, $(INSTALLED_PKG_DIRS), \
$(call make-command, \ $(call make-command, \
CROSS_COMPILE="$(CrossCompilePrefix)" \ CROSS_COMPILE="$(CrossCompilePrefix)" \
......
...@@ -543,6 +543,8 @@ compiler/cmm/Bitmap_HC_OPTS += -ffull-laziness ...@@ -543,6 +543,8 @@ compiler/cmm/Bitmap_HC_OPTS += -ffull-laziness
# for some unknown reason, so turn full-laziness back on for this module. # for some unknown reason, so turn full-laziness back on for this module.
endif endif
GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# C compiler # C compiler
# #
......
...@@ -61,7 +61,7 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage ...@@ -61,7 +61,7 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage
# #
# $1_$2_EXTRA_HC_OPTS GHC options for this dir/distdir mk/build.mk # $1_$2_EXTRA_HC_OPTS GHC options for this dir/distdir mk/build.mk
# #
# $1_$2_HC_PKGCONF -package-conf flag if necessary rules/package-config.mk # $1_$2_HC_PKGCONF -package-db flag if necessary rules/package-config.mk
# #
# $1_$2_HS_SRC_DIRS dirs relative to $1 containing $1/$2/package-data.mk # $1_$2_HS_SRC_DIRS dirs relative to $1 containing $1/$2/package-data.mk
# source files # source files
......
...@@ -34,10 +34,10 @@ $1_$2_HC_MK_DEPEND = $$($1_$2_HC) ...@@ -34,10 +34,10 @@ $1_$2_HC_MK_DEPEND = $$($1_$2_HC)
# on cygwin we get a dep on c:/ghc/..., and make gets confused by the : # on cygwin we get a dep on c:/ghc/..., and make gets confused by the :
$1_$2_HC_MK_DEPEND_DEP = $1_$2_HC_MK_DEPEND_DEP =
$1_$2_HC_DEP = $1_$2_HC_DEP =
$1_$2_HC_PKGCONF = -package-conf $$(BOOTSTRAPPING_CONF) $1_$2_HC_PKGCONF = -$(GHC_PACKAGE_DB_FLAG) $$(BOOTSTRAPPING_CONF)
$1_$2_GHC_PKG_OPTS = --package-conf=$$(BOOTSTRAPPING_CONF) $1_$2_GHC_PKG_OPTS = --$(GHC_PACKAGE_DB_FLAG)=$$(BOOTSTRAPPING_CONF)
$1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF) $1_$2_CONFIGURE_OPTS += --package-db=$$(TOP)/$$(BOOTSTRAPPING_CONF)
$1_$2_MORE_HC_OPTS += -no-user-package-conf $1_$2_MORE_HC_OPTS += -no-user-$(GHC_PACKAGE_DB_FLAG)
$1_$2_MORE_HC_OPTS += -rtsopts $1_$2_MORE_HC_OPTS += -rtsopts
else else
$1_$2_HC_PKGCONF = $1_$2_HC_PKGCONF =
...@@ -51,7 +51,7 @@ $1_$2_GHC_PKG_OPTS = ...@@ -51,7 +51,7 @@ $1_$2_GHC_PKG_OPTS =
$1_$2_HC_MK_DEPEND = $$(GHC_STAGE1) $1_$2_HC_MK_DEPEND = $$(GHC_STAGE1)
$1_$2_HC_MK_DEPEND_DEP = $$($1_$2_HC_MK_DEPEND) $1_$2_HC_MK_DEPEND_DEP = $$($1_$2_HC_MK_DEPEND)
$1_$2_HC_DEP = $$($1_$2_HC) $1_$2_HC_DEP = $$($1_$2_HC)
$1_$2_MORE_HC_OPTS += -no-user-package-conf $1_$2_MORE_HC_OPTS += -no-user-package-db
$1_$2_MORE_HC_OPTS += -rtsopts $1_$2_MORE_HC_OPTS += -rtsopts
endif endif
......
...@@ -190,7 +190,7 @@ doInstall ghc ghcpkg strip topdir directory distDir ...@@ -190,7 +190,7 @@ doInstall ghc ghcpkg strip topdir directory distDir
programPostConf = \_ _ -> return ["-B" ++ topdir], programPostConf = \_ _ -> return ["-B" ++ topdir],
programFindLocation = \_ -> return (Just ghc) } programFindLocation = \_ -> return (Just ghc) }
ghcPkgProgram' = ghcPkgProgram { ghcPkgProgram' = ghcPkgProgram {
programPostConf = \_ _ -> return $ ["--global-conf", ghcpkgconf] programPostConf = \_ _ -> return $ ["--global-package-db", ghcpkgconf]
++ ["--force" | not (null myDestDir) ], ++ ["--force" | not (null myDestDir) ],
programFindLocation = \_ -> return (Just ghcpkg) } programFindLocation = \_ -> return (Just ghcpkg) }
stripProgram' = stripProgram { stripProgram' = stripProgram {
......
...@@ -27,7 +27,7 @@ $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/C ...@@ -27,7 +27,7 @@ $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(wildcard libraries/Cabal/C
$(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(GHC_CABAL_DIR)/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/. $(GHC_CABAL_DIR)/dist/build/tmp/ghc-cabal$(exeext): $(GHC_CABAL_DIR)/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/.
"$(GHC)" $(SRC_HC_OPTS) --make $(GHC_CABAL_DIR)/Main.hs -o $@ \ "$(GHC)" $(SRC_HC_OPTS) --make $(GHC_CABAL_DIR)/Main.hs -o $@ \
-no-user-package-conf \ -no-user-$(GHC_PACKAGE_DB_FLAG) \
-Wall \ -Wall \
-DCABAL_VERSION=$(CABAL_VERSION) \ -DCABAL_VERSION=$(CABAL_VERSION) \
-odir bootstrapping \ -odir bootstrapping \
......
...@@ -119,11 +119,11 @@ flags = [ ...@@ -119,11 +119,11 @@ flags = [
"use the current user's package database", "use the current user's package database",
Option [] ["global"] (NoArg FlagGlobal) Option [] ["global"] (NoArg FlagGlobal)
"use the global package database", "use the global package database",
Option ['f'] ["package-conf"] (ReqArg FlagConfig "FILE") Option ['f'] ["package-db"] (ReqArg FlagConfig "FILE")
"use the specified package config file", "use the specified package config file",
Option [] ["global-conf"] (ReqArg FlagGlobalConfig "FILE") Option [] ["global-package-db"] (ReqArg FlagGlobalConfig "FILE")
"location of the global package config", "location of the global package config",
Option [] ["no-user-package-conf"] (NoArg FlagNoUserDb) Option [] ["no-user-package-db"] (NoArg FlagNoUserDb)
"never read the user package database", "never read the user package database",
Option [] ["force"] (NoArg FlagForce) Option [] ["force"] (NoArg FlagForce)
"ignore missing dependencies, directories, and libraries", "ignore missing dependencies, directories, and libraries",
...@@ -177,8 +177,8 @@ usageHeader prog = substProg prog $ ...@@ -177,8 +177,8 @@ usageHeader prog = substProg prog $
" $p init {path}\n" ++ " $p init {path}\n" ++
" Create and initialise a package database at the location {path}.\n" ++ " Create and initialise a package database at the location {path}.\n" ++
" Packages can be registered in the new database using the register\n" ++ " Packages can be registered in the new database using the register\n" ++
" command with --package-conf={path}. To use the new database with GHC,\n" ++ " command with --package-db={path}. To use the new database with GHC,\n" ++
" use GHC's -package-conf flag.\n" ++ " use GHC's -package-db flag.\n" ++
"\n" ++ "\n" ++
" $p register {filename | -}\n" ++ " $p register {filename | -}\n" ++
" Register the package using the specified installed package\n" ++ " Register the package using the specified installed package\n" ++
...@@ -247,7 +247,7 @@ usageHeader prog = substProg prog $ ...@@ -247,7 +247,7 @@ usageHeader prog = substProg prog $
" Regenerate the package database cache. This command should only be\n" ++ " Regenerate the package database cache. This command should only be\n" ++
" necessary if you added a package to the database by dropping a file\n" ++ " necessary if you added a package to the database by dropping a file\n" ++
" into the database directory manually. By default, the global DB\n" ++ " into the database directory manually. By default, the global DB\n" ++
" is recached; to recache a different DB use --user or --package-conf\n" ++ " is recached; to recache a different DB use --user or --package-db\n" ++
" as appropriate.\n" ++ " as appropriate.\n" ++
"\n" ++ "\n" ++
" Substring matching is supported for {module} in find-module and\n" ++ " Substring matching is supported for {module} in find-module and\n" ++
...@@ -257,13 +257,13 @@ usageHeader prog = substProg prog $ ...@@ -257,13 +257,13 @@ usageHeader prog = substProg prog $
" When asked to modify a database (register, unregister, update,\n"++ " When asked to modify a database (register, unregister, update,\n"++
" hide, expose, and also check), ghc-pkg modifies the global database by\n"++ " hide, expose, and also check), ghc-pkg modifies the global database by\n"++
" default. Specifying --user causes it to act on the user database,\n"++ " default. Specifying --user causes it to act on the user database,\n"++
" or --package-conf can be used to act on another database\n"++ " or --package-db can be used to act on another database\n"++
" entirely. When multiple of these options are given, the rightmost\n"++ " entirely. When multiple of these options are given, the rightmost\n"++
" one is used as the database to act upon.\n"++ " one is used as the database to act upon.\n"++
"\n"++ "\n"++
" Commands that query the package database (list, tree, latest, describe,\n"++ " Commands that query the package database (list, tree, latest, describe,\n"++
" field) operate on the list of databases specified by the flags\n"++ " field) operate on the list of databases specified by the flags\n"++
" --user, --global, and --package-conf. If none of these flags are\n"++ " --user, --global, and --package-db. If none of these flags are\n"++
" given, the default is --global --user.\n"++ " given, the default is --global --user.\n"++
"\n" ++ "\n" ++
" The following optional flags are also accepted:\n" " The following optional flags are also accepted:\n"
...@@ -471,9 +471,9 @@ getPkgDatabases :: Verbosity ...@@ -471,9 +471,9 @@ getPkgDatabases :: Verbosity
getPkgDatabases verbosity modify use_cache expand_vars my_flags = do getPkgDatabases verbosity modify use_cache expand_vars my_flags = do
-- first we determine the location of the global package config. On Windows, -- first we determine the location of the global package config. On Windows,
-- this is found relative to the ghc-pkg.exe binary, whereas on Unix the -- this is found relative to the ghc-pkg.exe binary, whereas on Unix the
-- location is passed to the binary using the --global-config flag by the -- location is passed to the binary using the --global-package-db flag by the
-- wrapper script. -- wrapper script.
let err_msg = "missing --global-conf option, location of global package.conf unknown\n" let err_msg = "missing --global-package-db option, location of global package database unknown\n"
global_conf <- global_conf <-
case [ f | FlagGlobalConfig f <- my_flags ] of case [ f | FlagGlobalConfig f <- my_flags ] of
[] -> do mb_dir <- getLibDir [] -> do mb_dir <- getLibDir
......
#!/bin/sh #!/bin/sh
PKGCONF="$topdir/package.conf.d" PKGCONF="$topdir/package.conf.d"
exec "$executablename" --global-conf "$PKGCONF" ${1+"$@"} exec "$executablename" --global-package-db "$PKGCONF" ${1+"$@"}
...@@ -24,7 +24,7 @@ else ...@@ -24,7 +24,7 @@ else
$(call removeFiles,$@) $(call removeFiles,$@)
echo "#!/bin/sh" >>$@ echo "#!/bin/sh" >>$@
echo "PKGCONF=$(TOP)/$(INPLACE_PACKAGE_CONF)" >>$@ echo "PKGCONF=$(TOP)/$(INPLACE_PACKAGE_CONF)" >>$@
echo '$(TOP)/$< --global-conf $$PKGCONF $${1+"$$@"}' >> $@ echo '$(TOP)/$< --global-package-db $$PKGCONF $${1+"$$@"}' >> $@
chmod +x $@ chmod +x $@
endif endif
...@@ -38,7 +38,7 @@ else ...@@ -38,7 +38,7 @@ else
$(call removeFiles,$@) $(call removeFiles,$@)
echo "#!/bin/sh" >>$@ echo "#!/bin/sh" >>$@
echo "PKGCONF=$(TOP)/$(INPLACE_PACKAGE_CONF)" >>$@ echo "PKGCONF=$(TOP)/$(INPLACE_PACKAGE_CONF)" >>$@
echo '$(TOP)/$< --global-conf $$PKGCONF $${1+"$$@"}' >> $@ echo '$(TOP)/$< --global-package-db $$PKGCONF $${1+"$$@"}' >> $@
chmod +x $@ chmod +x $@
endif endif
...@@ -53,7 +53,7 @@ endif ...@@ -53,7 +53,7 @@ endif
# #
utils/ghc-pkg/dist/build/tmp/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/Main.hs utils/ghc-pkg/Version.hs | bootstrapping/. $$(dir $$@)/. $(GHC_CABAL_INPLACE) utils/ghc-pkg/dist/build/tmp/$(utils/ghc-pkg_dist_PROG)$(exeext): utils/ghc-pkg/Main.hs utils/ghc-pkg/Version.hs | bootstrapping/. $$(dir $$@)/. $(GHC_CABAL_INPLACE)
"$(GHC)" $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \ "$(GHC)" $(SRC_HC_OPTS) --make utils/ghc-pkg/Main.hs -o $@ \
-no-user-package-conf \ -no-user-$(GHC_PACKAGE_DB_FLAG) \
-Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \ -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \
$(SRC_HC_WARNING_OPTS) \ $(SRC_HC_WARNING_OPTS) \
-DCABAL_VERSION=$(CABAL_VERSION) \ -DCABAL_VERSION=$(CABAL_VERSION) \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment