John Ericson
7ef4448c97
Merge commit '9d8f9b2e531bf95a700a949d879927fb6996ffc9' into binutils-wrapper
2017-12-13 16:08:36 -05:00
John Ericson
26a5612aeb
libstdc++5: Fix after binutils-wrapper
...
Will need to be editted again to work for cross
2017-12-13 16:08:19 -05:00
John Ericson
12e0672d88
gcc: Adjust builder.sh to find some things in bintools-wrapper instead
2017-12-13 16:08:19 -05:00
John Ericson
99806c5e12
bintools-wrapper: Create man and info outputs propagated underlying ones
...
These will be installed if the wrappers are. The wrappers aren't very
good to install, but that's another matter.
2017-12-13 16:08:19 -05:00
John Ericson
cebe1b4c08
darwin binutils: Better handling of man pages and info
2017-12-13 16:08:18 -05:00
John Ericson
ef178be597
bintools-wrapper: Support ld.ldd, along with ld.bfd and ld.gold
...
Also make the code more precise in the process
2017-12-13 16:08:18 -05:00
John Ericson
b8a21aa918
misc setup-hooks: Use env vars to refer to binutils programs
...
This is more robust for cross-compilation
2017-12-13 16:08:18 -05:00
John Ericson
91ca46f693
doc: Document Bintools Wrapper
...
Shrunk the CC Wrapper documentation so as not to be repetative.
2017-12-13 16:08:18 -05:00
John Ericson
2bba929062
bintools-wrapper: Import separately from cc-wrapper
2017-12-13 16:08:18 -05:00
John Ericson
8e557ed2c5
bintools-wrapper: Init
...
Factor a bintools (i.e. binutils / cctools) wrapper out of cc-wrapper. While
only LD is wrapped, the setup hook defines environment variables on behalf of
other utilites.
2017-12-13 16:08:18 -05:00
John Ericson
4f869bccc1
cc-wrapper: Don't treat "-" alone as a flag
...
It means stdin, and is morally equivalent to passing a file. e.g.
$ echo 'int main(void) { return 0; }' | gcc -x c -
will compile and link a binary.
2017-12-13 16:08:17 -05:00
John Ericson
bdd6c037c0
cc-wrapper: Use separate mangler for "bool" variables
...
This avoids any `NIX_FOOBAR=1 1` not triggering conditions.
2017-12-13 16:08:17 -05:00
John Ericson
fc7ed86915
cc-wrapper: Pull variable mangler into utils.sh
...
In preparation for splitting out bintools-wrapper
2017-12-13 16:08:13 -05:00
John Ericson
45d4b27d02
cc-wrapper: GNAT wrapper stop caring about -m32
...
It need not concern itself with 32-bit dynamic linking; ld-wrapper handles that now.
2017-12-11 19:12:28 -05:00
John Ericson
4e4520a0f3
gcc: Don't choke if there is no lib output
2017-12-10 17:36:15 -05:00
John Ericson
0c88078d37
Merge branch 'fix-splice' into ericson2314-cross-base
2017-12-10 17:15:07 -05:00
John Ericson
6c36d3c9e0
top-level: Fix splicing, again
2017-12-10 17:01:23 -05:00
John Ericson
79816cd64b
Merge branch 'fix-splice' into ericson2314-cross-base
2017-12-10 15:16:42 -05:00
John Ericson
965cc5da57
top-level: Fix splicing in the presence of evaluation errors
...
- No more `or {}`, this was misleading at best since those values
wouldn't be used unless the attr they are defined from was present
anyways.
- `tryEval` for get outputs. This ensures that if some derivations fail, they
won't take out the others. This benefited from the `or {}` before, but that
was never good enough. `tryEval` is strictly better.
2017-12-09 20:02:45 -05:00
John Ericson
3afe325a3e
Merge commit '43d5c5d6db3ce33f3cf1d17ba43c7374257466ec' into gcc-modernize-builder
2017-12-07 02:19:04 -05:00
John Ericson
e82bd498d1
Merge commit '992bd2f6d34b2f560fc17df6fa3708fcade1abac' into gcc-modernize-builder
2017-12-07 02:13:24 -05:00
John Ericson
3a59cd87f2
Merge commit '93cd0685c5ac4d8f21d8586d3e5c45cd7394fab9' into gcc-modernize-builder
2017-12-07 01:49:31 -05:00
John Ericson
51948eab94
gcc: Fix after merge
...
- NIX_CC_CROSS is now completely gone!
- NIX_CC is defined reliably, so no manual def needed
- stdenv.ccCross -> stdenv.cc, also removing need for "or" fallback
2017-12-07 01:42:43 -05:00
John Ericson
974b9201a5
Merge commit 'c9ca54199409324101bdee38f5b16e7656a16a22' into gcc-modernize-builder
2017-12-07 01:42:35 -05:00
John Ericson
d96cf0f46c
gcc: Handle CPATH
and LIBRARY_PATH
purely in Nix
2017-12-06 19:12:51 -05:00
John Ericson
d4595b38e9
gcc: Modernize builder.sh for Cross
...
Instead of `NIX_CC` vs `NIX_CC_CROSS` spagetti, unconditionally use
`NIX_BUILD_CC` and `NIX_CC` in a consistent manner.
2017-12-06 19:12:50 -05:00
John Ericson
43d5c5d6db
Merge commit '703a9f93c1254f7bdf0350ca0462de0d78033c62' into gcc-simplify-flags
2017-12-05 17:58:16 -05:00
John Ericson
992bd2f6d3
Merge commit 'ab77a6bb1e7d2ff475210ad392f1a9bd1bb6ba3a' into gcc-simplify-flags
2017-12-05 17:41:15 -05:00
John Ericson
93cd0685c5
Merge commit '71186e73455a4e06e96a31da34b76f84e545ba1f' into gcc-simplify-flags
2017-12-05 17:09:41 -05:00
John Ericson
c9ca541994
Merge commit '198dceccbe5414a5fd72ca83624c0cc715db1aad' into gcc-simplify-flags
2017-12-05 16:55:11 -05:00
Franz Pletz
aeffc007fb
coreutils: fix tests depending on setuid/setgid bits
...
(cherry picked from commit 6a850d2b11
)
2017-12-05 14:17:41 -05:00
John Ericson
c8d435476d
lib: Unbreak pogoplug example platform
...
Vendor needed to be made valid
2017-12-05 14:17:00 -05:00
John Ericson
a3e35fbbe1
gcc: Use platformFlags in crossConfigureFlags
...
A nice code deduplication
2017-12-05 14:01:18 -05:00
John Ericson
1fe9798ac2
lib, gcc: No inherit (platform) gcc;
in {host,build,target}Platform
2017-12-05 13:52:20 -05:00
Will Dietz
9d8f9b2e53
Add clang multilib variants (x64_64-only, 64/32bit), basic multilib tests
2017-12-05 07:17:14 -06:00
John Ericson
74cbb5796e
gcc: Get rid of crossAttrs.configureFlags
2017-12-04 20:50:59 -05:00
John Ericson
cabfe1885f
gcc: Don't try to enable plugins with host != build
2017-12-04 16:27:18 -05:00
John Ericson
2fdca4db69
gcc: Lock down more tools for cross-builds
...
That is, build != host == target
2017-12-04 16:27:18 -05:00
Will Dietz
115bf9d2cf
cc-wrapper: don't add broken cflags to clang
...
On non-GNU (gcc) compilers, there is no "/lib/gcc/..."
so when this is eventually expanded this is empty
resulting in an incomplete "-idirafter " that
eats the next argument:
-idirafter -B/nix/store/wamjwwdvkmhbf4f2902nhw8jxxzv0hy3-clang-wrapper-4.0.1/bin/
2017-11-30 18:43:43 -06:00
Orivej Desh
64f945efd2
Revert "qt48: use tabs in the Makefile patch"
...
to apply a different fix, since the current one does not apply to Darwin.
This reverts commit bfaf7ae5ae
.
2017-11-30 07:42:07 +00:00
Vladimír Čunát
a8f3df29c6
Merge #32165 : curlFull: add brotli support
2017-11-29 22:36:47 +01:00
Tuomas Tynkkynen
703a9f93c1
gcc6: Restore missing platform flags
...
This was missed in commit 1c1207220f
("gcc: Refactor treatment of configure flags"), all other GCC versions
have it right.
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
0f249a7354
gccSnapshot: Reduce diff to gcc7
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
d7a0695c43
gcc7: Reduce diff to gcc6
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
825b953bf5
gcc48: Reduce diff to gcc49
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
77b409b2cf
gcc49: Reduce diff to gcc5
2017-11-29 23:09:17 +02:00
Tuomas Tynkkynen
aa3d195a30
gcc5: Reduce diff to gcc6
2017-11-29 23:09:16 +02:00
Orivej Desh
0c9ba0e149
Merge pull request #32173 from dtzWill/fix/qt48-parallel-patch-tabs
...
qt48: match whitespace in context of patch to better apply on @dtzWill's tree and maybe future nixpkgs too
2017-11-29 18:59:11 +00:00
Vladimír Čunát
a4280a5e1c
mesa_noglu: use llvm-5 on aarch64 as well
2017-11-29 18:06:57 +01:00
Vladimír Čunát
6671aac6a9
Merge branch 'master' into staging
...
to fix llvm on aarch64
2017-11-29 18:05:51 +01:00