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.

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

Resolves #610 #622

Merged
merged 2 commits into from
Dec 11, 2018
Merged

Resolves #610 #622

merged 2 commits into from
Dec 11, 2018

Conversation

simrankedia
Copy link
Contributor

@simrankedia simrankedia commented Dec 10, 2018

Resolves #610

Copy link
Collaborator

@julianoes julianoes left a comment

Choose a reason for hiding this comment

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

Awesome, thank you. One small comment needs to be deleted, then this is good to be merged.

Makefile Show resolved Hide resolved
NPROCS := $(shell grep -c ^processor /proc/cpuinfo)
endif
ifeq ($(OS),Darwin) #Mac OS
NPROCS := $(shell sysctl -n hw.ncpu || echo 1)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Tested, works.

OS := $(shell uname -s)

ifeq ($(OS),Linux)
NPROCS := $(shell grep -c ^processor /proc/cpuinfo)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Works on my Arch Linux.

@simrankedia
Copy link
Contributor Author

Hi,
I have updated the changes. Please have a look.
Thanks

Copy link
Collaborator

@julianoes julianoes left a comment

Choose a reason for hiding this comment

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

Great, thanks.

@julianoes julianoes merged commit e802dcc into mavlink:develop Dec 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants