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

E2K: fixed build by MCST lcc compiler #1365

Merged
merged 2 commits into from
Nov 15, 2019
Merged

E2K: fixed build by MCST lcc compiler #1365

merged 2 commits into from
Nov 15, 2019

Conversation

r-a-sattarov
Copy link
Contributor

@r-a-sattarov r-a-sattarov commented Nov 10, 2019

What does this PR do?

  • fixed build by MCST lcc compiler on MCST Elbrus 2000 architecture when using Curl
  • strip UTF-8 BOM of file curl_utils.c for compability with MCST lcc compiler < 1.24

How does this PR change Premake's behavior?

This PR doesn't change Premake's behaviour to the end user.

Anything else we should know?

e2k (Elbrus 2000) - this is VLIW/EPIC architecture, like Intel Itanium architecture.

About this architecture:

Did you check all the boxes?

  • Focus on a single fix or feature; remove any unrelated formatting or code changes
  • Add unit tests showing fix or feature works; all tests pass
  • Mention any related issues (put closes #XXXX in comment to auto-close issue when PR is merged)
  • Follow our coding conventions
  • Minimize the number of commits

You can now support Premake on our OpenCollective. Your contributions help us spend more time responding to requests like these!

- fixed build by MCST lcc compiler on MCST Elbrus 2000 architecture when using Curl
- strip UTF-8 BOM for compability with MCST lcc compiler < 1.24
@r-a-sattarov
Copy link
Contributor Author

My changes were accepted in the main branch of Curl.

curl/curl@8063c32

Copy link
Member

@samsinsane samsinsane left a comment

Choose a reason for hiding this comment

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

This seems fine to me, @starkos should we merge this or grab latest curl instead?

@starkos
Copy link
Member

starkos commented Nov 11, 2019

Seems to make more sense to just grab the new curl? I don't recall exactly what hoops we need to jump through when we do that though…

@r-a-sattarov
Copy link
Contributor Author

There are differences in file structure between these versions of Curl (for example, curlbuild.h in the old version and system.h in the new version seem similar to each other).

But in any case, please remove BOM (Byte Order Mark) from src/host/curl_utils.c file. MCST lcc compiler version < 1.24 does not understand BOM.

@starkos
Copy link
Member

starkos commented Nov 15, 2019

Okay, guess it makes sense to get this merged now then. Thanks for the contribution!

@starkos starkos merged commit cd6fa6a into premake:master Nov 15, 2019
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.

3 participants