gfortran/gcc: simplify & clean up on Darwin #24152
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 should eliminate the branched logic for gfortran on Darwin, as well as preventing accidental inclusion of impure paths in gcc and gfortran builds.
|
@copumpkin, thanks for your PR! By analyzing the history of the files in this pull request, we identified @adnelson, @datakurre and @globin to be potential reviewers. |
LnL7
approved these changes
Mar 21, 2017
|
Just tested that there's no mass rebuild on NixOS, so I'm going to merge. |
|
Now |
|
Whoops, I'll take a look a bit later, thanks
…On Tue, Mar 21, 2017 at 18:01 vbgl ***@***.***> wrote:
Now csdp fails to build. This might be related to the changes in this PR.
clang -O3 -ansi -Wall -DNOSHORTS -DUSEGETTIME -I../include csdp.o -L../lib -lsdp -llapack -lblas -lgfortran -lm -o csdp
clang-3.7: warning: argument unused during compilation: '-ansi'
ld: library not found for -lgfortran
—
You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub
<#24152 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAAKP6JO8tBPCbzvq3uoO8kMmyl7SI5Hks5roEjXgaJpZM4MjW0s>
.
|
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 should eliminate the branched logic for gfortran on Darwin, as well as preventing accidental inclusion of impure paths in gcc and gfortran builds.
Note that I don't think this will be a mass Linux rebuild, because I null out the
prePatchon anything but a Darwin stdenv. It also won't mass-rebuild Darwin, so it should be pretty safe.cc @adnelson
P.S: I tested the new
gfortranexpression withnumpyon Darwin and it seemed to be building fine...Motivation for this change
The forked gfortran expression had broken on the latest LLVM 4 branch of the Darwin stdenv, so I noticed the fork and decided to kill it.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)