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

Unpin gcc-4.8 for later versions of Suse #858

Merged
merged 1 commit into from
Oct 10, 2018

Conversation

jaymalasinha
Copy link
Contributor

@jaymalasinha jaymalasinha commented Oct 9, 2018

Signed-off-by: Jaymala Sinha jsinha@chef.io

Description

Suse platform versions later than 12 should compile using the default gcc version.
Only use gcc-4.8 for Suse platforms before version 12.


Maintainers

Please ensure that you check for:

  • [] If this change impacts git cache validity, it bumps the git cache
    serial number
  • [] If this change impacts compatibility with omnibus-software, the
    corresponding change is reviewed and there is a release plan
  • [] If this change impacts compatibility with the omnibus cookbook, the
    corresponding change is reviewed and there is a release plan

@jaymalasinha jaymalasinha requested a review from a team as a code owner October 9, 2018 15:03
Copy link
Contributor

@scotthain scotthain left a comment

Choose a reason for hiding this comment

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

One minor fix

@@ -700,7 +700,7 @@ def with_standard_compiler_flags(env = {}, opts = {})
"CFLAGS" => "-I#{install_dir}/embedded/include -O2",
}
# Enable gcc version 4.8 if it is available
if which("gcc-4.8")
if which("gcc-4.8") && platform_version.satisfies?("<= 11.4")
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's make this < 12, just in case there's ever an 11.5

Signed-off-by: Jaymala Sinha <jsinha@chef.io>
@jaymalasinha
Copy link
Contributor Author

@scotthain updated as per your review comment.

@jaymalasinha jaymalasinha merged commit a98661c into master Oct 10, 2018
@chef-ci chef-ci deleted the jsinha/fix-suse-gccpin branch October 10, 2018 17:56
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