diff options
author | Tamar Christina <tamar@zhox.com> | 2022-02-21 19:22:26 +0000 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2022-03-04 13:41:59 -0500 |
commit | b3d7230ec0a6bf40a846081231be288c3948f789 (patch) | |
tree | d393167f7bcad6236f58c4ff587f2d174b4356d9 | |
parent | 0438cc2e62ac112bc0617b7b92a7accd71a33411 (diff) | |
download | haskell-b3d7230ec0a6bf40a846081231be288c3948f789.tar.gz |
windows: include aux lib dir path explicitly so e.g. cabal can't override it.
(cherry picked from commit 557db332a1e2044e8c87eb43aa17b50a13e56092)
-rw-r--r-- | driver/gcc/gcc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/driver/gcc/gcc.c b/driver/gcc/gcc.c index aa63bb0498..c8dc0ed0f5 100644 --- a/driver/gcc/gcc.c +++ b/driver/gcc/gcc.c @@ -14,7 +14,7 @@ int main(int argc, char** argv) { char *binDir; char *exePath; - char *preArgv[4]; + char *preArgv[5]; char *oldPath; char *newPath; char *base; @@ -59,8 +59,9 @@ int main(int argc, char** argv) { #endif preArgv[2] = mkString("-B%s/../lib/gcc/%s/%s" , binDir, base, version); - preArgv[3] = mkString("-B%s/../libexec/gcc/%s/%s", binDir, base, version); + preArgv[3] = mkString("-B%s/../%s/lib/" , binDir, base); + preArgv[4] = mkString("-B%s/../libexec/gcc/%s/%s", binDir, base, version); - run(exePath, 4, preArgv, argc - 1, argv + 1, NULL); + run(exePath, 5, preArgv, argc - 1, argv + 1, NULL); } |