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.

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

Add flags to superenv when building with [email protected] #13568

Merged
merged 2 commits into from
Jul 20, 2022
Merged

Add flags to superenv when building with [email protected] #13568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ab6382
shims/super/cc: add nostdinc and rpath-link when using [email protected]
danielnachun Jul 17, 2022
47b6492
extend/os/linux/extend/ENV/super.rb: add homebrew_extra_include_paths
danielnachun Jul 17, 2022
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
11 changes: 11 additions & 0 deletions Library/Homebrew/extend/os/linux/extend/ENV/super.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@ def homebrew_extra_paths
paths
end

def homebrew_extra_isystem_paths
paths = []
# Add paths for GCC headers when building against [email protected] because we have to use -nostdinc.
if deps.any? { |d| d.name == "[email protected]" }
Copy link
Member

Choose a reason for hiding this comment

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

@danielnachun I'd really like if we can extract all these references into a global constant or, if that doesn't allow superenv handling, a file somewhere.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So basically use a variable instead of hard coding [email protected] so we only have to change it once? That does seem better for maintainability, I just have to see where I can define it that will be seen by both the superenv and the compiler shim.

Copy link
Member

Choose a reason for hiding this comment

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

@danielnachun I think the answer may be "nowhere" but at least if it's in two places with a comment in both that says to change them both at once that'd be better!

Copy link
Member

@carlocab carlocab Jul 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Our compiler shim doesn't load the Homebrew module, but we can definitely put this into a global constant which is passed to the compiler shim via an environment variable.

Copy link
Member

Choose a reason for hiding this comment

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

ooo environment variable, good idea 👍🏻

Copy link
Member

Choose a reason for hiding this comment

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

Or the existing cccfg system

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we could append_to_cccfg a character for whenever glibc@#{MIN_GLIBC_VERSION} is a dependency where MIN_GLIBC_VERSION is an environment variable we set once globally. The individual conditionals on [email protected] being a dependency could then be replaced with conditional on HOMEBREW_CCCFG containing the relevant character, and the actual flags we set would also use #{MIN_GLIBC_VERSION} instead of the hardcoded 2.13 we're currently using. That should mean that whenever the version needs to be changed, we can just update MIN_GLIBC_VERSION and everything else will be updated automatically because it's not hardcoded.

Now that we know our strategy for handling [email protected] works I can just test the refactoring by trying to build binutils as it will fail quickly if I mess something up. Thanks for the great suggestions for this!

gcc_include_dir = Utils.safe_popen_read(cc, "--print-file-name=include").chomp
gcc_include_fixed_dir = Utils.safe_popen_read(cc, "--print-file-name=include-fixed").chomp
paths << gcc_include_dir << gcc_include_fixed_dir
end
paths
end

def determine_rpath_paths(formula)
PATH.new(
*formula&.lib,
Expand Down
5 changes: 5 additions & 0 deletions Library/Homebrew/shims/super/cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,8 @@ class Cmd
args.concat(optflags) unless runtime_cpu_detection?
args.concat(archflags)
args << "-std=#{@arg0}" if /c[89]9/.match?(@arg0)
# Add -nostdinc when building against [email protected] to avoid mixing system and brewed glibc headers.
args << "-nostdinc" if @deps.include?("[email protected]")
Copy link
Member

@Bo98 Bo98 Jul 20, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

Looks like this is gated to not run if we're not doing arg refurbishment (line 287).

I argue we actually want to do this unconditionally. I think this should be in cppflags instead, like the other -isystem flags. cppflags applies to all modes - including cpp invokations where neither cflags nor cxxflags are used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That makes sense. I tried this and it fixed the issue where the system headers were still being included seen here: Homebrew/homebrew-portable-ruby#156 (comment).

args
end

Expand Down Expand Up @@ -326,6 +328,9 @@ class Cmd
end
args += rpath_flags("#{wl}-rpath=", rpath_paths)
args += ["#{wl}--dynamic-linker=#{dynamic_linker_path}"] if dynamic_linker_path
# Use -rpath-link to make sure linker uses [email protected] rather than the system glibc for indirect
# dependencies because -L will only handle direct dependencies.
args << "#{wl}-rpath-link=#{@opt}/[email protected]/lib" if @deps.include?("[email protected]")
Copy link
Member

Choose a reason for hiding this comment

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

Do we need to change the -B a few lines above?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I guess it would only matter if the user was building against [email protected] on a host where brewed glibc was also installed. Given that we're only building against [email protected] for relocatable bottles I don't think scenario should happen very often. We could probably accommodate this by just doing:

if @deps.include?("[email protected]")
  args << "-B#{@opt}/[email protected]/lib"
else
  args << "-B#{@opt}/glibc/lib"
end

If this sounds good I'll push the change.

Copy link
Member

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

Choose a reason for hiding this comment

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

Did you decide against pushing this?

Copy link
Member

Choose a reason for hiding this comment

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

I suspect @danielnachun forgot.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sorry I misunderstood your comment as wanting to merge as-is. We need to fix the issue below with unconditionally passing nostdinc so I will add this in a follow up PR.

args
end

Expand Down