Update Solaris SPARC compile options. #39
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This solves part of knu#32 based almost entirely on the solution that @MarkGibbons provided. Since SPARC is technically a 64bit operating system by default, this seems reasonable. Signed-off-by: Scott Hain <shain@chef.io>
|
@scotthain, it's good as is. Thanks |
This was referenced Mar 14, 2018
knu
approved these changes
Mar 30, 2018
|
Thanks! |
knu
reviewed
Mar 30, 2018
| @@ -4,6 +4,18 @@ | |||
| $LDFLAGS << ' ' << `#{CONFIG['CC']} -print-file-name=libstdc++.a`.chomp | |||
| else | |||
| have_library('stdc++') | |||
| # Do a little trickery here to enable C++ standard on Solaris 11 if found. | |||
| # This also forces 64bit compilation mode. | |||
| if (RbConfig::CONFIG['host_os'] =~ /solaris(!?2.11)/) | |||
There was a problem hiding this comment.
Oh wait, does host_os optionally include a ! on Solaris 2.11? Is that what you mean by this regexp?
There was a problem hiding this comment.
that looks like some mistaken copypasta. (?!2.11) would be a negative lookahead assertion but (!?2.11) does match either "solaris!2.11" or "solaris2.11"
i'm reasonably certain that should just be =~ /solaris2.11/)
paging @scotthain for confirmation tho.
There was a problem hiding this comment.
This may answer what we want to match against.
irb(main):001:0> RbConfig::CONFIG['host_os']
RbConfig::CONFIG['host_os']
=> "solaris2.11"
But I would make the regex =~ /solaris2\.11/
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This solves part of #32 based almost entirely on the solution that @MarkGibbons provided. Since SPARC is technically a 64bit operating system by default, this seems reasonable.
Signed-off-by: Scott Hain shain@chef.io
@MarkGibbons I am happy to add an Authored by or amend commits for full attribution if you'd prefer!