diff --git a/util/bundle.kk b/util/bundle.kk index da5e18d47..7453b0944 100644 --- a/util/bundle.kk +++ b/util/bundle.kk @@ -208,13 +208,14 @@ fun copy-kklib( variant : variant, libdir : path, cc : string, version : string val vardir = cc ++ "-" ++ variant.show val objdir = libdir / vardir val outdir = "out" / version / vardir + val kklib = if (get-os-name()=="windows") then "kklib.obj" else "kklib.o" ensure-dir(objdir) + copy-file-to-dir( outdir / kklib, objdir ) val all = list-directory(outdir) val files = all.filter(fn(f){ !is-directory(f) }) val objs = files.filter(fn(f){ val ext = f.extname - ((f.basename.starts-with("std_").bool && ext != "core") - || ext == "a" || ext == "lib" || ext == "o" || ext == "obj") + ((f.basename.starts-with("std_").bool && ext != "core") || ext == "a" || ext == "lib" ) }) objs.foreach fn(obj){ // println("copy " ++ obj.string) diff --git a/util/install.bat b/util/install.bat index 42e81ea09..201cfe87f 100644 --- a/util/install.bat +++ b/util/install.bat @@ -245,7 +245,7 @@ REM --------------------------------------------------------- REM Install Clang if needed REM --------------------------------------------------------- -where /q clang-clx +where /q clang-cl if not errorlevel 1 goto done_clang echo.