Skip to content

Commit bcc23f3

Browse files
committed
Fix optional sassc on windows (link static for now)
1 parent 5bebe2c commit bcc23f3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Makefile.PL

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ if ($install_sassc) {
306306
$sassc_version = <$fh> if (defined $fh);
307307
chomp($sassc_version);
308308
print "Detected sassc $sassc_version\n";
309-
# create compile flags to include the libsass version
309+
# create compile flags to include the sassc version
310310
push @defs, qq(SASSC_VERSION=\\"$sassc_version\\");
311311
} else {
312312
# give a warning if the version could not be determined (probably not generated yet)
@@ -648,6 +648,10 @@ sub libsass_sassc
648648
}
649649
# otherwise we asume gcc
650650
else {
651+
# On windows there is nothing like rpath for dll load paths
652+
# So dll and sassc would need to be in same directory
653+
# For now we just fall back to link sassc statically
654+
my $static = $static || $^O eq 'MSWin32';
651655
# create the sassc executable by linking against sassc and libsass
652656
push @ret, "\t" . '$(LD) -o $(SASSC_EXE) $(LDFLAGS) -lm $(SASSC_OBJ) $(LIBS)'
653657
. ' ' . ($static ? '$(LIBSASS_OBJ)' : '-L$(INST_ARCHAUTODIR) -lsass -lstdc++')

0 commit comments

Comments
 (0)