diff mbox

[libgomp] Make libgomp Fortran modules multilib-aware

Message ID 765E0C1E-597F-427F-909A-1DD909512431@gmail.com
State New
Headers show

Commit Message

FX Coudert Dec. 26, 2016, 11:25 a.m. UTC 
*ping*

This patch from May makes libgomp install its Fortran modules in the correct multilib-aware directories, following what libgfortran does.

> The attached patch allows libgomp to install its Fortran modules in the correct multilib-aware directories, just like libgfortran does.
> Without it, multilib Fortran OpenMP code using the modules fails to compile because the modules are not found:
> 
> $ gfortran -fopenmp a.f90 
> $ gfortran -fopenmp a.f90 -m32
> a.f90:1:6:
> 
>   use omp_lib
>      1
> Fatal Error: Can't open module file ‘omp_lib.mod’ for reading at (1): No such file or directory
> compilation terminated.
> 
> 
> 
> Bootstrapped and tested on x86_64-apple-darwin15. OK to commit?
> 
> FX
> 
> 
> 
> 
> 
> 
> 2016-05-03  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
> 
> 	PR libgomp/60670
> 	* Makefile.am: Make fincludedir multilib-aware.
> 	* Makefile.in: Regenerate.
diff mbox

Patch

Index: libgomp/Makefile.am
===================================================================
--- libgomp/Makefile.am	(revision 235843)
+++ libgomp/Makefile.am	(working copy)
@@ -10,7 +10,7 @@  config_path = @config_path@
 search_path = $(addprefix $(top_srcdir)/config/, $(config_path)) $(top_srcdir) \
 	      $(top_srcdir)/../include
 
-fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/finclude
+fincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)$(MULTISUBDIR)/finclude
 libsubincludedir = $(libdir)/gcc/$(target_alias)/$(gcc_version)/include
 
 vpath % $(strip $(search_path))