From 63d09d2bc4e3ffff4c776a0e399711a0498124ff Mon Sep 17 00:00:00 2001 From: sof Date: Thu, 16 Sep 1999 17:14:33 +0000 Subject: [PATCH] [project @ 1999-09-16 17:14:33 by sof] Handle -syslib com for non-installed builds ; dLL_ifs.hi is not a normal .hi file --- ghc/utils/mkdependHS/mkdependHS.prl | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ghc/utils/mkdependHS/mkdependHS.prl b/ghc/utils/mkdependHS/mkdependHS.prl index ef1d670..980a858 100644 --- a/ghc/utils/mkdependHS/mkdependHS.prl +++ b/ghc/utils/mkdependHS/mkdependHS.prl @@ -133,8 +133,11 @@ if (!$Include_prelude) { foreach $lib ( @Syslibs ) { local($dir); + # Yuck ^ 2 if ( $lib eq 'win32' && ! $INSTALLING ) { $dir = "${TopPwd}/hslibs/${lib}/src"; + } elsif ( $lib eq 'com' && ! $INSTALLING ) { + $dir = "${TopPwd}/hdirect/lib"; } else { $dir = ($INSTALLING) ? "${InstLibDirGhc}/imports/${lib}" : "${TopPwd}/ghc/lib/${lib}"; @@ -338,7 +341,11 @@ sub preprocess_import_dirs { for ($_ = readdir(DIR); $_; $_ = readdir(DIR)) { next unless /(.*)\.hi$/; $thing = $1; - if ($ModuleIn{$thing} && $ModuleIn{$thing} ne $d) { + # + # dLL_ifs.hi is used to indicate whether a directory + # contains interface files whose object codes reside in a Win32 DLL. + # + if ($ModuleIn{$thing} && $ModuleIn{$thing} ne $d && $thing ne 'dLL_ifs') { print STDERR "$Pgm: warning: $thing.hi appears in both $ModuleIn{$thing} and $d!\n" if ($Warnings); } else { $ModuleIn{$thing} = $d; -- 1.7.10.4