Skip to content

Commit 9688e91

Browse files
authored
Use .dll.a file in th-dlls-minimal (#2216)
1 parent ef40c28 commit 9688e91

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

test/th-dlls-minimal/default.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ let
1010
cabalProjectLocal = builtins.readFile ../cabal.project.local;
1111
modules = [
1212
({pkgs, ...}: {
13+
packages.th-dlls-minimal.components.library.preBuild = ''
14+
export ISERV_ARGS=-v
15+
export PROSY_ARGS=-v
16+
'';
1317
packages.test-lib.components.library.libs = mkForce [
1418
(pkgs.stdenv.mkDerivation {
1519
name = "test-clib";

test/th-dlls-minimal/test-clib/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ test.a: test.o
55
$(AR) -rs test-clib.a test.o
66

77
test.dll: test.o
8-
$(CC) -o test-clib.dll -shared test.o
8+
$(CC) -o test-clib-0.dll -shared test.o -Wl,--out-implib=test-clib.dll.a
99

1010
.PHONY: install
1111
install: test.a test.dll
1212
mkdir $(out)/bin
1313
mkdir $(out)/lib
14-
mv test-clib.dll $(out)/bin
14+
mv test-clib-0.dll $(out)/bin
15+
mv test-clib.dll.a $(out)/bin
1516
mv test-clib.a $(out)/lib
1617

0 commit comments

Comments
 (0)