pyrox.dev
gcc: 6.3.0 -> 6.4.0
-25
pkgs/development/compilers/gcc/6/darwin-const-correct.patch
-25
pkgs/development/compilers/gcc/6/darwin-const-correct.patch
···
1
-
From 5972cd58bde3bc8bacfe994e5b127c411241f255 Mon Sep 17 00:00:00 2001
2
-
From: law <law@138bc75d-0d04-0410-961f-82ee72b054a4>
3
-
Date: Tue, 3 Jan 2017 05:36:40 +0000
4
-
Subject: [PATCH] * config/darwin-driver.c (darwin_driver_init):
5
-
Const-correctness fixes for first_period and second_period variables.
6
-
7
-
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@244010 138bc75d-0d04-0410-961f-82ee72b054a4
8
-
---
9
-
diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c
10
-
index 0c4f0cd..e3ed79d 100644
11
-
--- a/gcc/config/darwin-driver.c
12
-
+++ b/gcc/config/darwin-driver.c
13
-
@@ -299,10 +299,10 @@ darwin_driver_init (unsigned int *decoded_options_count,
14
-
if (vers_string != NULL)
15
-
{
16
-
char *asm_major = NULL;
17
-
- char *first_period = strchr(vers_string, '.');
18
-
+ const char *first_period = strchr(vers_string, '.');
19
-
if (first_period != NULL)
20
-
{
21
-
- char *second_period = strchr(first_period+1, '.');
22
-
+ const char *second_period = strchr(first_period+1, '.');
23
-
if (second_period != NULL)
24
-
asm_major = xstrndup (vers_string, second_period-vers_string);
25
-
else
+4
-5
pkgs/development/compilers/gcc/6/default.nix
+4
-5
pkgs/development/compilers/gcc/6/default.nix
···
58
58
with stdenv.lib;
59
59
with builtins;
60
60
61
-
let version = "6.3.0";
61
+
let version = "6.4.0";
62
62
63
63
# Whether building a cross-compiler for GNU/Hurd.
64
64
crossGNU = targetPlatform != hostPlatform && targetPlatform.config == "i586-pc-gnu";
···
72
72
# The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
73
73
# target libraries and tools.
74
74
++ optional langAda ../gnat-cflags.patch
75
-
++ optional langFortran ../gfortran-driving.patch
76
-
++ optional hostPlatform.isDarwin ./darwin-const-correct.patch; # Kill this after 6.3.0
75
+
++ optional langFortran ../gfortran-driving.patch;
77
76
78
77
javaEcj = fetchurl {
79
78
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
···
213
212
builder = ../builder.sh;
214
213
215
214
src = fetchurl {
216
-
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
217
-
sha256 = "17xjz30jb65hcf714vn9gcxvrrji8j20xm7n33qg1ywhyzryfsph";
215
+
url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz";
216
+
sha256 = "1m0lr7938lw5d773dkvwld90hjlcq2282517d1gwvrfzmwgg42w5";
218
217
};
219
218
220
219
inherit patches;