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

gts: Fix cross compilation #96906

Merged
merged 1 commit into from Sep 12, 2020
Merged

gts: Fix cross compilation #96906

merged 1 commit into from Sep 12, 2020

Conversation

kampka
Copy link
Contributor

@kampka kampka commented Sep 1, 2020

Motivation for this change

gts generate binaries during the build process that are used during the
build process. When building cross-platform, these binaries are not
executable as they are built with for the target platform instead of the
host platform. The boostrap build introduced here will first build gts
natively and then cross-platform, using the native binaries in the
cross-build.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@kampka kampka added the 6.topic: cross-compilation Building packages on a different sort platform than than they will be run on label Sep 1, 2020
@kampka
Copy link
Contributor Author

kampka commented Sep 1, 2020

@GrahamcOfBorg build gts
@GrahamcOfBorg build pkgsCross.aarch64-multiplatform.gts

@jonringer
Copy link
Contributor

@GrahamcOfBorg eval

sha256 = "07mqx09jxh8cv9753y2d2jsv7wp8vjmrd7zcfpbrddz3wc9kx705";
};

# glib needs to be in nativeBuildInputs in order for AM_PATH_GLIB_2_0
Copy link
Contributor

Choose a reason for hiding this comment

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

This is suspicious, I would expect the macros to be picked up just like pkg-config files are.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The macro itself is not the issue, it's the AC_TRY_RUN that is used by AM_PATH_GLIB_2_0 internally which will fail if not run in native context.

}

bootstrap = stdenv.mkDerivation (drv { pname = "${name}-bootstrap"; } // stdenv.lib.optionalAttrs (cross) {
configureFlags = [ "CC=${buildPackages.stdenv.cc}/bin/cc" ];
Copy link
Contributor

@jtojnar jtojnar Sep 1, 2020

Choose a reason for hiding this comment

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

Would not it perhaps be possible to just change the compiler for building the predicates_init in the Makefile.am? I am not very familiar with automake myself but this looks overly complicated.

cc @matthewbauer @Ericson2314

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Pushed a simplified approach.

gts generate binaries during the build process that are used during the
build process. When building cross-platform, these binaries are not
executable as they are built with for the target platform instead of the
host platform. The boostrap build introduced here will first build gts
natively and then cross-platform, using the native binaries in the
cross-build.
@kampka
Copy link
Contributor Author

kampka commented Sep 2, 2020

@GrahamcOfBorg build gts
@GrahamcOfBorg build pkgsCross.aarch64-multiplatform.gts

@kampka kampka requested a review from jtojnar September 2, 2020 15:06
@Ericson2314 Ericson2314 merged commit 2e075ba into NixOS:staging Sep 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 10.rebuild-darwin: 101-500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants