Skip to content

build: Set noarch as default TARGET_ARCH #1947

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

Merged
merged 1 commit into from
Jul 31, 2020
Merged

build: Set noarch as default TARGET_ARCH #1947

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
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ if(EXPERIMENTAL)
endif()

# Add arch-dependant flags
if(NOT DEFINED TARGET_ARCH)
message(WARNING "Use generic flags since TARGET_ARCH is not defined")
set(TARGET_ARCH "noarch")
endif()
Copy link
Contributor

@galpeter galpeter Jul 29, 2020

Choose a reason for hiding this comment

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

If we are adding a TARGET_ARCH to be defined as "noarch" if it is not defined then the last else in the following check will never trigger. Is it not possible to set this via debian rules?

Copy link
Contributor Author

@rzr rzr Jul 30, 2020

Choose a reason for hiding this comment

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

well I used to overide in debian/rules but I thought it would be better to have it set default upstream to avoid relying on undefined values,
I could remove the else warning since it's added in my patch.

Copy link
Contributor

@galpeter galpeter Jul 30, 2020

Choose a reason for hiding this comment

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

ohh wait. I misunderstood the if-s here. The change is ok. If the user specified an incorrect arch then a warning will be printed out bellow, but if there is no arch configured then this will be triggered.

if("${TARGET_ARCH}" STREQUAL "arm")
iotjs_add_compile_flags(-D__arm__ -mthumb -fno-short-enums -mlittle-endian)
elseif("${TARGET_ARCH}" STREQUAL "i686")
Expand Down