File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -178,9 +178,11 @@ if FONT_VARIATIONS
178178CARGO_FEATURE_ARGS += --features variations
179179endif
180180
181- rusile.so : $(rusile_so_SOURCES ) $(bin_PROGRAMS )
181+ @builddir@/target/@RUST_TARGET_SUBDIR@/librusile. $( SHARED_LIB_EXT ) : $(rusile_so_SOURCES ) $(bin_PROGRAMS )
182182 $(CARGO_ENV ) $(CARGO ) build $(CARGO_VERBOSE ) --target $(CARGO_TARGET_TRIPLE ) $(RUSILE_FEATURE_ARG ) $(CARGO_RELEASE_ARGS ) -p rusile
183- $(INSTALL ) @builddir@/target/@RUST_TARGET_SUBDIR@/lib$@ $@
183+
184+ rusile.so : @builddir@/target/@RUST_TARGET_SUBDIR@/librusile.$(SHARED_LIB_EXT )
185+ $(INSTALL ) $< $@
184186
185187DEPDIR := .deps
186188LOCALFONTS := FONTCONFIG_FILE=$(PWD ) /fontconfig.conf
Original file line number Diff line number Diff line change @@ -247,7 +247,7 @@ AC_SUBST([ICU_LIBS])
247247
248248case $host_os in
249249 darwin*)
250- SHARED_LIB_EXT="so "
250+ SHARED_LIB_EXT="dylib "
251251 ;;
252252 cygwin*|mingw*)
253253 SHARED_LIB_EXT="dll"
Original file line number Diff line number Diff line change 4343-- Prepend paths specifically for C modules.
4444local function prependCPath (path)
4545 package.cpath = prepend_and_dedup(path .. "/?.@SHARED_LIB_EXT@", package.cpath)
46+ if "@SHARED_LIB_EXT@" ~= "so" then
47+ package.cpath = prepend_and_dedup(path .. "/?.so", package.cpath)
48+ end
4649end
4750
4851-- Take a given path and iterate over permutations of paths that LuaRocks might have installed a rock to that are
You can’t perform that action at this time.
0 commit comments