diff options
| author | Mark H Weaver <mhw@netris.org> | 2016-10-12 09:28:14 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2016-10-12 09:28:14 -0400 |
| commit | abcf4858cda9ded59671681ab9820b5358d8bb16 (patch) | |
| tree | fd1b0a53affad3ad0eb9b3867a2c127228530973 /gnu/packages/gcc.scm | |
| parent | 82adf4952ac1c03af3b41851ef4bbe1d2d6935a0 (diff) | |
| parent | bfb48f4f33583f58392a05f1d6cbf559156293ed (diff) | |
| download | guix-abcf4858cda9ded59671681ab9820b5358d8bb16.tar guix-abcf4858cda9ded59671681ab9820b5358d8bb16.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gcc.scm')
| -rw-r--r-- | gnu/packages/gcc.scm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index b26e93e886..bed277b1e0 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -566,6 +566,13 @@ as the 'native-search-paths' field." (("libgcj(_bc)?_la_LDFLAGS =" ldflags _) (string-append ldflags " -Wl,-rpath=$(libdir)"))))) (add-after + 'unpack 'patch-testsuite + ;; dejagnu-1.6 removes the 'absolute' command + (lambda _ + (substitute* "libjava/testsuite/lib/libjava.exp" + (("absolute") "file normalize")) + #t)) + (add-after 'install 'install-javac-and-javap-wrappers (lambda _ (let* ((javac (assoc-ref %build-inputs "javac.in")) |