Skip to content

Commit

Permalink
Fix asmjit debug compile
Browse files Browse the repository at this point in the history
  • Loading branch information
garazdawi committed Feb 19, 2025
1 parent f856a74 commit 02723cc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/dockerfiles/Dockerfile.64-bit
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ WORKDIR /buildroot/otp/
ENV CFLAGS="-O2 -g -Werror -DwxSTC_DISABLE_MACRO_DEPRECATIONS=1"
ENV CFLAGS="${CFLAGS} -Wall -Wformat -Wformat=2 -Wno-conversion -Wimplicit-fallthrough \
-Werror=format-security -Wtrampolines -fsanitize=signed-integer-overflow"
ENV CXXFLAGS="-Wno-maybe-uninitialized"
## OpenSSF recommended CFLAGS, skipped are:
## -Wconversion -Wextra -Wsign-conversion - As we have way too many of these warnings
## -fstrict-flex-arrays=3 -Wbidi-chars=any - As gcc 11 does not support it
Expand Down Expand Up @@ -43,6 +44,7 @@ RUN if [ ! -f Makefile ]; then \
## Disable -Werror as testcases do not compile with it on
ENV CFLAGS="-O2 -g"
ENV LDFLAGS=""
ENV CXXFLAGS=""

## Update init.sh with correct env vars
RUN echo "export MAKEFLAGS=$MAKEFLAGS" > /buildroot/env.sh && \
Expand Down
2 changes: 1 addition & 1 deletion erts/emulator/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ ifeq ($(FLAVOR),jit)
CFLAGS += -DBEAMASM=1
ENABLE_ALLOC_TYPE_VARS += beamasm
endif
CXXFLAGS = $(filter-out -Werror=implicit -Wstrict-prototypes -Wmissing-prototypes -Wdeclaration-after-statement -Werror=maybe-uninitialized,$(CFLAGS)) $(TYPE_CXXFLAGS)
CXXFLAGS = $(filter-out -Werror=implicit -Wstrict-prototypes -Wmissing-prototypes -Wdeclaration-after-statement,$(CFLAGS)) $(TYPE_CXXFLAGS)
HCC = @HCC@
LD = @LD@
DEXPORT = @DEXPORT@
Expand Down

0 comments on commit 02723cc

Please sign in to comment.