2025-07-07 16:17 UTC+0200 Aleksander Czajczynski (hb fki.pl)

* config/win/clang.mk
    + add resource compiler detection chain to first stage,
      now harbour.exe binary should also have manifest resource
      compiled in when clang is used. Previously second stage rc
      calling was implemented only in hbmk2.

  * utils/hbmk2/hbmk2.prg
    ! fixed disappearing llvm-ar with fallback to ar, spotted
      in windows-ci/MSYS2
This commit is contained in:
Aleksander Czajczynski
2025-07-07 16:17:12 +02:00
parent b1b372ccc5
commit 0ff2885a66
3 changed files with 44 additions and 3 deletions

View File

@@ -4481,7 +4481,8 @@ STATIC FUNCTION __hbmk( aArgs, nArgTarget, nLevel, /* @ */ lPause, /* @ */ lExit
cLibLibExt := ".a"
ENDIF
cImpLibExt := cLibLibExt
IF hbmk[ _HBMK_cCOMP ] == "clang"
IF hbmk[ _HBMK_cCOMP ] == "clang" .AND. !( FindInPath( hbmk[ _HBMK_cCCPREFIX ] + "llvm-ar" + hbmk[ _HBMK_cCCEXT ] ) == NIL )
/* new clang toolchains not always distribute llvm-ar (or it is renamed) */
cBin_Lib := hbmk[ _HBMK_cCCPREFIX ] + "llvm-ar" + hbmk[ _HBMK_cCCEXT ]
ELSEIF hbmk[ _HBMK_cCOMP ] == "tcc"
cBin_Lib := "tiny_libmaker.exe"