tangled
alpha
login
or
join now
tjh.dev
/
nixpkgs
Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
0
fork
atom
overview
issues
pulls
pipelines
ispc: fix build
Pascal Wittmann
10 years ago
273cc85e
5ea3dfcc
+27
-2
2 changed files
expand all
collapse all
unified
split
pkgs
development
compilers
ispc
default.nix
gcc5.patch
+5
-2
pkgs/development/compilers/ispc/default.nix
···
15
15
sha256 = "15qi22qvmlx3jrhrf3rwl0y77v66prpan6qb66a55dw3pw2d4jvn";
16
16
};
17
17
18
18
-
enableParallelBuilding = true;
18
18
+
enableParallelBuilding = false;
19
19
20
20
doCheck = true;
21
21
···
29
29
clang
30
30
];
31
31
32
32
-
patchPhase = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile";
32
32
+
# https://github.com/ispc/ispc/pull/1190
33
33
+
patches = [ ./gcc5.patch ];
34
34
+
35
35
+
postPatch = "sed -i -e 's/\\/bin\\///g' -e 's/-lcurses/-lncurses/g' Makefile";
33
36
34
37
installPhase = ''
35
38
mkdir -p $out/bin
+22
pkgs/development/compilers/ispc/gcc5.patch
···
1
1
+
diff --git a/cbackend.cpp b/cbackend.cpp
2
2
+
index 3552205..9c05824 100644
3
3
+
--- a/cbackend.cpp
4
4
+
+++ b/cbackend.cpp
5
5
+
@@ -1641,7 +1641,7 @@ void CWriter::printConstant(llvm::Constant *CPV, bool Static) {
6
6
+
V = Tmp.convertToDouble();
7
7
+
}
8
8
+
9
9
+
- if (isnan(V)) {
10
10
+
+ if (std::isnan(V)) {
11
11
+
// The value is NaN
12
12
+
13
13
+
// FIXME the actual NaN bits should be emitted.
14
14
+
@@ -1665,7 +1665,7 @@ void CWriter::printConstant(llvm::Constant *CPV, bool Static) {
15
15
+
else
16
16
+
Out << "LLVM_NAN" << (Val == QuietNaN ? "" : "S") << "(\""
17
17
+
<< Buffer << "\") /*nan*/ ";
18
18
+
- } else if (isinf(V)) {
19
19
+
+ } else if (std::isinf(V)) {
20
20
+
// The value is Inf
21
21
+
if (V < 0) Out << '-';
22
22
+
Out << "LLVM_INF" <<