fixed windows build

Signed-off-by: Erik Jan de Wit <[email protected]>
mvnpm · Jan 31, 2024 · 104ddb1 · 104ddb1
1 parent 1d23c24
commit 104ddb1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -29,9 +29,9 @@ download-win:
 	mv dart-sass $(BUILDDIR)
 
 build-win32:
-	CGO_ENABLED=0 GOOS="$(GOOS)" GOARCH="$(GOARCH)" go build $(GO_FLAGS) -o "build/$(BUILDDIR)/package/esbuild.exe" ./esbuild_scss.go
-	@$(MAKE) --no-print-directory GOOS="$(GOOS)" GOARCH="$(ARCH)" BUILDDIR="build/$(BUILDDIR)/package" download-win
-	tar -czf "build/esbuild-$(BUILDDIR)-$(VERSION).tgz" --directory "build/$(BUILDDIR)" package
+	CGO_ENABLED=0 GOOS="$(GOOS)" GOARCH="$(GOARCH)" go build $(GO_FLAGS) -o "build/$(BUILDDIR)/package/bin/esbuild.exe" ./esbuild_scss.go
+	@$(MAKE) --no-print-directory GOOS="$(GOOS)" GOARCH="$(ARCH)" BUILDDIR="build/$(BUILDDIR)" download-win
+	tar -czf "build/esbuild-$(BUILDDIR)-$(VERSION).tgz" --directory "build/$(BUILDDIR)" package dart-sass
 
 platform-win32-x64:
 	@$(MAKE) --no-print-directory GOOS=windows GOARCH=amd64 ARCH=x64 BUILDDIR=win32-x64 build-win32

diff --git a/esbuild_scss.go b/esbuild_scss.go
@@ -76,7 +76,7 @@ func compileSass(inputPath, outputPath string, build api.PluginBuild) (string, e
 	bin := filepath.Dir(current)
 	pack := filepath.Dir(bin)
 	dartSass := filepath.Join(filepath.Dir(pack), "dart-sass")
-	os.Setenv("PATH", os.Getenv("PATH")+":"+dartSass)
+	os.Setenv("PATH", os.Getenv("PATH")+string(os.PathListSeparator)+dartSass)
 
 	sourceSyntax := findSourceSyntax(inputPath)