diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-01-19 00:18:37 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-01-19 00:18:37 -0500 |
| commit | afe9f409491a055e5d058c8f747e80d1506391e5 (patch) | |
| tree | 3b3747c9d2df32019a46b283b94f0a7af05ebf1d /gnu/packages/patches | |
| parent | bb8afbf5a1fbc85f700c0e07ce5581637e3674dc (diff) | |
| parent | 1348185ac2bb48b373495830267cff8ddc6b1fa5 (diff) | |
| download | guix-afe9f409491a055e5d058c8f747e80d1506391e5.tar guix-afe9f409491a055e5d058c8f747e80d1506391e5.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/bowtie-fix-makefile.patch | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/gnu/packages/patches/bowtie-fix-makefile.patch b/gnu/packages/patches/bowtie-fix-makefile.patch deleted file mode 100644 index 5ac65731cb..0000000000 --- a/gnu/packages/patches/bowtie-fix-makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4a99b0023bdfbbe486b9649489a32ea184c18c9a Mon Sep 17 00:00:00 2001 -From: Valentin Antonescu <valentin@jhu.edu> -Date: Tue, 2 Dec 2014 11:19:13 -0500 -Subject: [PATCH] Make sure the Mavericks test happens only under Darwin. - ---- - Makefile | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index d74f7c8..a4cdfa7 100644 ---- a/Makefile -+++ b/Makefile -@@ -54,12 +54,11 @@ endif - MACOS = 0 - ifneq (,$(findstring Darwin,$(shell uname))) - MACOS = 1 --endif -- --ifneq (,$(findstring 13,$(shell uname -r))) -- CPP = clang++ -- CC = clang -- EXTRA_FLAGS += -stdlib=libstdc++ -+ ifneq (,$(findstring 13,$(shell uname -r))) -+ CPP = clang++ -+ CC = clang -+ EXTRA_FLAGS += -stdlib=libstdc++ -+ endif - endif - - POPCNT_CAPABILITY ?= 1 |