[commit: ghc] wip/nfs-locking: Reset GHC_PACKAGE_PATH varialbe (3rd try). (de13770)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/de13770f7941733a8af2fbd6daeef6fb916b6a11/ghc

>---------------------------------------------------------------

commit de13770f7941733a8af2fbd6daeef6fb916b6a11
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Jan 9 18:07:22 2016 +0000

    Reset GHC_PACKAGE_PATH varialbe (3rd try).
    
    See #110. [skip ci]


>---------------------------------------------------------------

de13770f7941733a8af2fbd6daeef6fb916b6a11
 .appveyor.yml | 3 ---
 build.bat     | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index e382140..16de309 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -23,8 +23,5 @@ install:
     - happy --version
 
 build_script:
-    - set GHC_PACKAGE_PATH
-    - set GHC_PACKAGE_PATH=
-    - set GHC_PACKAGE_PATH
     - cd C:\msys64\home\ghc\shake-build
     - echo "" | stack --no-terminal exec -- build.bat -j --no-progress
diff --git a/build.bat b/build.bat
index a4e2548..4cbbc42 100644
--- a/build.bat
+++ b/build.bat
@@ -16,4 +16,7 @@
                ".."        ^
                %*
 
+ at rem Unset GHC_PACKAGE_PATH variable, as otherwise ghc-cabal complains
+ at if defined GHC_PACKAGE_PATH ( set GHC_PACKAGE_PATH )
+
 @ghc %ghcArgs% && .shake\build %shakeArgs%