Skip to content

Commit

Permalink
Make 14.0.x versions equivalent to 14.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
thierry-martinez committed Jun 10, 2022
1 parent b18cf66 commit bc53a49
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
6 changes: 6 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,12 @@ AS_IF([test "x$EQUIVALENT_LLVM_VERSION" = "x13.0.0"],
[AC_SUBST([EQUIVALENT_LLVM_VERSION], [[13.0.1]])])
AS_IF([test "x$EQUIVALENT_LLVM_VERSION" = "x14.0.1"],
[AC_SUBST([EQUIVALENT_LLVM_VERSION], [[14.0.0]])])
AS_IF([test "x$EQUIVALENT_LLVM_VERSION" = "x14.0.2"],
[AC_SUBST([EQUIVALENT_LLVM_VERSION], [[14.0.0]])])
AS_IF([test "x$EQUIVALENT_LLVM_VERSION" = "x14.0.3"],
[AC_SUBST([EQUIVALENT_LLVM_VERSION], [[14.0.0]])])
AS_IF([test "x$EQUIVALENT_LLVM_VERSION" = "x14.0.4"],
[AC_SUBST([EQUIVALENT_LLVM_VERSION], [[14.0.0]])])

AC_SUBST([EQUIVALENT_LLVM_VERSION_MAJOR], [[`echo $EQUIVALENT_LLVM_VERSION | \
sed 's/^\([[:digit:]][[:digit:]]*\)[.]\([[:digit:]][[:digit:]]*\)[.]\([[:digit:]][[:digit:]]*\)/\1/'`]])
Expand Down
3 changes: 3 additions & 0 deletions tools/stubgen_common/stubgen_common.ml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ let prepare_clang_options cflags llvm_config =
| "12.0.0" -> "12.0.1"
| "13.0.0" -> "13.0.1"
| "14.0.1" -> "14.0.0"
| "14.0.2" -> "14.0.0"
| "14.0.3" -> "14.0.0"
| "14.0.4" -> "14.0.0"
| _ -> llvm_version in
let version_option =
String.map (fun c -> if c = '.' then '_' else c)
Expand Down

0 comments on commit bc53a49

Please sign in to comment.