Merge pull request #18 from wojtekmach/wm-makefile

Fix building on OTP 26
yjh0502 · Jul 3, 2023 · a7499a6 · a7499a6
2 parents 75edc24 + e14c834
commit a7499a6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -21,6 +21,9 @@ jobs:
           - otp_version: '22.3.4.20'
             rebar3_version: '3.15.2'
             os: ubuntu-18.04
+          - otp_version: '26.0.2'
+            rebar3_version: '3.22.0'
+            os: ubuntu-18.04
     env:
       OTP_VERSION: ${{ matrix.otp_version }}
     steps:

diff --git a/c_src/Makefile b/c_src/Makefile
@@ -5,7 +5,7 @@ BASEDIR := $(abspath $(CURDIR)/..)
 
 PROJECT = brotli
 
-ERTS_INCLUDE_DIR ?= $(shell erl -noshell -s init stop -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)]).")
+ERTS_INCLUDE_DIR ?= $(shell erl -noshell -eval "io:format(\"~s/erts-~s/include/\", [code:root_dir(), erlang:system_info(version)]), halt().")
 
 ifndef REBAR_BARE_COMPILER_OUTPUT_DIR
 	OUT ?= $(BASEDIR)/priv