Index: libgomp/configure |
diff --git a/libgomp/configure b/libgomp/configure |
index deef67334057a85e9b5f4bcded965709a87ebc8f..8a25c5b19b241822dad8382e53cb5ddd9ba54b7a 100755 |
--- a/libgomp/configure |
+++ b/libgomp/configure |
@@ -4578,7 +4578,7 @@ freebsd* | dragonfly*) |
fi |
;; |
-gnu*) |
+gnu* | nacl*) |
lt_cv_deplibs_check_method=pass_all |
;; |
@@ -9379,6 +9379,21 @@ linux*oldld* | linux*aout* | linux*coff*) |
dynamic_linker=no |
;; |
+nacl*) |
+ version_type=linux |
+ need_lib_prefix=no |
+ need_version=no |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
+ soname_spec='${libname}${release}${shared_ext}$major' |
+ shlibpath_var=LD_LIBRARY_PATH |
+ shlibpath_overrides_runpath=no |
+ |
+ # This implies no fast_install, which is unacceptable. |
+ # Some rework will be needed to allow for fast_install |
+ # before this can be enabled. |
+ hardcode_into_libs=yes |
+ ;; |
+ |
# This must be Linux ELF. |
linux* | k*bsd*-gnu | kopensolaris*-gnu) |
version_type=linux |
@@ -10412,7 +10427,7 @@ else |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
lt_status=$lt_dlunknown |
cat > conftest.$ac_ext <<_LT_EOF |
-#line 10415 "configure" |
+#line 10430 "configure" |
#include "confdefs.h" |
#if HAVE_DLFCN_H |
@@ -10508,7 +10523,7 @@ else |
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 |
lt_status=$lt_dlunknown |
cat > conftest.$ac_ext <<_LT_EOF |
-#line 10511 "configure" |
+#line 10526 "configure" |
#include "confdefs.h" |
#if HAVE_DLFCN_H |
@@ -10859,7 +10874,7 @@ fi |
# Provide some information about the compiler. |
-echo "$as_me:10862:" \ |
+echo "$as_me:10877:" \ |
"checking for Fortran compiler version" >&5 |
ac_compiler=`set X $ac_compile; echo $2` |
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 |
@@ -11095,7 +11110,7 @@ fi |
# Provide some information about the compiler. |
-echo "$as_me:11098:" \ |
+echo "$as_me:11113:" \ |
"checking for Fortran compiler version" >&5 |
ac_compiler=`set X $ac_compile; echo $2` |
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 |
@@ -11835,11 +11850,11 @@ else |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
-e 's:$: $lt_compiler_flag:'` |
- (eval echo "\"\$as_me:11838: $lt_compile\"" >&5) |
+ (eval echo "\"\$as_me:11853: $lt_compile\"" >&5) |
(eval "$lt_compile" 2>conftest.err) |
ac_status=$? |
cat conftest.err >&5 |
- echo "$as_me:11842: \$? = $ac_status" >&5 |
+ echo "$as_me:11857: \$? = $ac_status" >&5 |
if (exit $ac_status) && test -s "$ac_outfile"; then |
# The compiler can only warn and ignore the option if not recognized |
# So say no if there are warnings other than the usual output. |
@@ -11934,11 +11949,11 @@ else |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
-e 's:$: $lt_compiler_flag:'` |
- (eval echo "\"\$as_me:11937: $lt_compile\"" >&5) |
+ (eval echo "\"\$as_me:11952: $lt_compile\"" >&5) |
(eval "$lt_compile" 2>out/conftest.err) |
ac_status=$? |
cat out/conftest.err >&5 |
- echo "$as_me:11941: \$? = $ac_status" >&5 |
+ echo "$as_me:11956: \$? = $ac_status" >&5 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext |
then |
# The compiler can only warn and ignore the option if not recognized |
@@ -11986,11 +12001,11 @@ else |
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ |
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ |
-e 's:$: $lt_compiler_flag:'` |
- (eval echo "\"\$as_me:11989: $lt_compile\"" >&5) |
+ (eval echo "\"\$as_me:12004: $lt_compile\"" >&5) |
(eval "$lt_compile" 2>out/conftest.err) |
ac_status=$? |
cat out/conftest.err >&5 |
- echo "$as_me:11993: \$? = $ac_status" >&5 |
+ echo "$as_me:12008: \$? = $ac_status" >&5 |
if (exit $ac_status) && test -s out/conftest2.$ac_objext |
then |
# The compiler can only warn and ignore the option if not recognized |
@@ -13588,6 +13603,21 @@ linux*oldld* | linux*aout* | linux*coff*) |
dynamic_linker=no |
;; |
+nacl*) |
+ version_type=linux |
+ need_lib_prefix=no |
+ need_version=no |
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' |
+ soname_spec='${libname}${release}${shared_ext}$major' |
+ shlibpath_var=LD_LIBRARY_PATH |
+ shlibpath_overrides_runpath=no |
+ |
+ # This implies no fast_install, which is unacceptable. |
+ # Some rework will be needed to allow for fast_install |
+ # before this can be enabled. |
+ hardcode_into_libs=yes |
+ ;; |
+ |
# This must be Linux ELF. |
linux* | k*bsd*-gnu | kopensolaris*-gnu) |
version_type=linux |