Skip to content

Commit

Permalink
Use .dll.a file in th-dlls-minimal (#2216)
Browse files Browse the repository at this point in the history
  • Loading branch information
hamishmack authored Jun 12, 2024
1 parent ef40c28 commit 9688e91
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions test/th-dlls-minimal/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ let
cabalProjectLocal = builtins.readFile ../cabal.project.local;
modules = [
({pkgs, ...}: {
packages.th-dlls-minimal.components.library.preBuild = ''
export ISERV_ARGS=-v
export PROSY_ARGS=-v
'';
packages.test-lib.components.library.libs = mkForce [
(pkgs.stdenv.mkDerivation {
name = "test-clib";
Expand Down
5 changes: 3 additions & 2 deletions test/th-dlls-minimal/test-clib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ test.a: test.o
$(AR) -rs test-clib.a test.o

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

.PHONY: install
install: test.a test.dll
mkdir $(out)/bin
mkdir $(out)/lib
mv test-clib.dll $(out)/bin
mv test-clib-0.dll $(out)/bin
mv test-clib.dll.a $(out)/bin
mv test-clib.a $(out)/lib

0 comments on commit 9688e91

Please sign in to comment.