Skip to content

gcc: revert "provide both native and cross forms of gcc.libs libraries" #213929

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

Merged
Ericson2314 merged 1 commit into from
Feb 1, 2023
Merged

gcc: revert "provide both native and cross forms of gcc.libs libraries" #213929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion pkgs/development/compilers/gcc/10/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,6 @@ stdenv.mkDerivation ({
};

targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
targetPlatformConfig = targetPlatform.config;

buildFlags = optional
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/compilers/gcc/11/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ stdenv.mkDerivation ({
};

targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
targetPlatformConfig = targetPlatform.config;

buildFlags = optional
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/compilers/gcc/12/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,6 @@ stdenv.mkDerivation ({
};

targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
targetPlatformConfig = targetPlatform.config;

buildFlags = optional
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/compilers/gcc/4.8/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ stdenv.mkDerivation ({
};

targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
targetPlatformConfig = targetPlatform.config;

buildFlags = optional
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/compilers/gcc/4.9/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ stdenv.mkDerivation ({
};

targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
targetPlatformConfig = targetPlatform.config;

buildFlags = optional
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/compilers/gcc/6/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,6 @@ stdenv.mkDerivation ({
};

targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
targetPlatformConfig = targetPlatform.config;

buildFlags = optional
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/compilers/gcc/7/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ stdenv.mkDerivation ({
;

targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
targetPlatformConfig = targetPlatform.config;

buildFlags = optional
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/compilers/gcc/8/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,6 @@ stdenv.mkDerivation ({
};

targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
targetPlatformConfig = targetPlatform.config;

buildFlags = optional
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/compilers/gcc/9/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ stdenv.mkDerivation ({
};

targetConfig = if targetPlatform != hostPlatform then targetPlatform.config else null;
targetPlatformConfig = targetPlatform.config;

buildFlags = optional
(targetPlatform == hostPlatform && hostPlatform == buildPlatform)
Expand Down
11 changes: 0 additions & 11 deletions pkgs/development/compilers/gcc/builder.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,17 +203,6 @@ preInstall() {
ln -s lib "$out/${targetConfig}/lib32"
ln -s lib "${!outputLib}/${targetConfig}/lib32"
fi

# cc-wrappers uses --sysroot=/nix/store/does/not/exist as a way to
# drop default sysheaders search path. Unfortunately that switches
# clang++ into searching libraries in gcc in cross-compiler paths:
# from ${!outputLib}/lib (native)
# to ${!outputLib}/${targetPlatformConfig}/lib
# We create the symlink to make both native and cross paths
# available even if the toolchain is not the cross-compiler.
if [ ! -e ${!outputLib}/${targetPlatformConfig} ] ; then
ln -s . ${!outputLib}/${targetPlatformConfig}
fi
}


Expand Down