diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ca5b379..46eb87fc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,6 +44,6 @@ jobs: - name: Environment run: luarocks config - name: Install Binding - run: luarocks build + run: luarocks build USER_CXX_FLAGS='-std=c++11 -Wall -Wextra -Werror -Wpedantic -pedantic-errors' - name: Run tests run: luarocks test diff --git a/Makefile b/Makefile index 91579c62..9b14d075 100644 --- a/Makefile +++ b/Makefile @@ -97,8 +97,6 @@ ifndef USER_CXX_FLAGS USER_CXX_FLAGS = endif -OTHER_CXXFLAGS = -std=c++11 -DIS_LUAJIT=$(IS_LUAJIT) -WARN_FLAGS = -Wall -Wextra -Werror -Wpedantic -pedantic-errors INCLUDE_PATH_FLAGS = $(addprefix -I,$(HEADER_DIRECTORIES)) LIB_PATH_FLAGS = $(addprefix -L,$(LIBRARY_DIRECTORIES)) REQUIRED_LIBS = unicorn pthread stdc++ @@ -123,7 +121,7 @@ ifeq ($(OS),Darwin) endif endif -CXX_CMD = $(CC) $(OTHER_CXXFLAGS) $(USER_CXX_FLAGS) $(WARN_FLAGS) $(INCLUDE_PATH_FLAGS) +CXX_CMD = $(CC) $(USER_CXX_FLAGS) $(INCLUDE_PATH_FLAGS) LINK_CMD = $(LD) $(LIB_PATH_FLAGS) $(LDFLAGS) DOCTEST_TAG = v2.4.11