Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix build error on openbsd arm64 (raspberry pi) #290

Merged
merged 1 commit into from
Mar 24, 2022
Merged

fix build error on openbsd arm64 (raspberry pi) #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ if(UNIX)
-DHAVE_STRINGS_H
-DHAVE_SYS_TIME_H
-DHAVE_UNAME
-DHAVE_SELECT_H
)
endif()

Expand Down
7 changes: 2 additions & 5 deletions mk/re.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,9 @@ CXXDFLAGS = -MD -MF $(@:.o=.d) -MT $@
ifeq ($(CC),)
CC := gcc
endif
ifeq ($(CC),cc)
CC := gcc
endif
LD := $(CC)

CC_LONGVER := $(shell $(CC) - --version|head -n 1)
CC_LONGVER := $(shell $(CC) --version|head -n 1)
CC_SHORTVER := $(shell $(CC) -dumpversion)
CC_MAJORVER := $(shell echo $(CC_SHORTVER) |\
sed -E 's/([0-9]+).[0-9]+.[0-9]+/\1/g')
Expand Down Expand Up @@ -392,7 +389,7 @@ endif

endif

ifneq ($(strip $(filter __arm64__ ,$(PREDEF))),)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

arm64 maybe is still needed for some platforms (iOS). Should we keep both ifneq blocks?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

aarch64 is added additionally.

ifneq ($(strip $(filter __arm64__ __aarch64__,$(PREDEF))),)
ARCH := arm64
endif

Expand Down