From 3fc8f85c828d9dde9db826fdef8db0744ae674a3 Mon Sep 17 00:00:00 2001 From: Omar Rizwan Date: Tue, 19 Mar 2024 15:22:28 -0400 Subject: Make loadlibLd, filter by architecture if multiple candidates Fixes https://discord.com/channels/956758212152025098/956758650700046366/1202431317971570728 --- virtual-programs/images.folk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'virtual-programs') diff --git a/virtual-programs/images.folk b/virtual-programs/images.folk index 1be51424..002760c0 100644 --- a/virtual-programs/images.folk +++ b/virtual-programs/images.folk @@ -23,10 +23,13 @@ namespace eval ::image { } set cc [c create] - c loadlib [expr {$tcl_platform(os) eq "Darwin" ? "/opt/homebrew/lib/libjpeg.dylib" : [lindex [exec /usr/sbin/ldconfig -p | grep libjpeg] end]}] - c loadlib [expr {$tcl_platform(os) eq "Darwin" ? "/opt/homebrew/lib/libpng.dylib" : [lindex [exec /usr/sbin/ldconfig -p | grep libpng] end]}] if {$tcl_platform(os) eq "Darwin"} { + c loadlib "/opt/homebrew/lib/libjpeg.dylib" + c loadlib "/opt/homebrew/lib/libpng.dylib" $cc cflags -I/opt/homebrew/include -L/opt/homebrew/lib + } else { + c loadlibLd libjpeg.so + c loadlibLd libpng } $cc cflags -ljpeg -lpng -- cgit v1.2.3