aboutsummaryrefslogtreecommitdiffstats
path: root/projects/sample
diff options
context:
space:
mode:
authorEric Christopher <echristo@apple.com>2011-10-26 00:42:12 +0000
committerEric Christopher <echristo@apple.com>2011-10-26 00:42:12 +0000
commit360fa9a29d65b6c9b69fb2ba9712d69098cfca13 (patch)
treee903da76b38eae98df806c2b4d091278e1d81a34 /projects/sample
parent5289142cc84c0e2df25d455c1d741bdd0e8b9b1e (diff)
downloadexternal_llvm-360fa9a29d65b6c9b69fb2ba9712d69098cfca13.zip
external_llvm-360fa9a29d65b6c9b69fb2ba9712d69098cfca13.tar.gz
external_llvm-360fa9a29d65b6c9b69fb2ba9712d69098cfca13.tar.bz2
Handle newer cases for freebsd which is approaching 10.0 and not 1.0.
Patch by Dimitry Andric! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@142995 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'projects/sample')
-rw-r--r--projects/sample/autoconf/ltmain.sh2
-rw-r--r--projects/sample/autoconf/m4/libtool.m412
2 files changed, 7 insertions, 7 deletions
diff --git a/projects/sample/autoconf/ltmain.sh b/projects/sample/autoconf/ltmain.sh
index 06823e0..2455278 100644
--- a/projects/sample/autoconf/ltmain.sh
+++ b/projects/sample/autoconf/ltmain.sh
@@ -4668,7 +4668,7 @@ static const void *lt_preloaded_setup() {
# linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
- *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
case "$compile_command " in
*" -static "*) ;;
*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
diff --git a/projects/sample/autoconf/m4/libtool.m4 b/projects/sample/autoconf/m4/libtool.m4
index e89738c..36ac3d1 100644
--- a/projects/sample/autoconf/m4/libtool.m4
+++ b/projects/sample/autoconf/m4/libtool.m4
@@ -1384,7 +1384,7 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
+freebsd1.*)
dynamic_linker=no
;;
@@ -1407,7 +1407,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[[123]]*) objformat=aout ;;
+ freebsd[[123]].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -1425,7 +1425,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -3099,7 +3099,7 @@ case $host_os in
;;
esac
;;
- freebsd[[12]]*)
+ freebsd[[12]].*)
# C++ shared libraries reported to be fairly broken before switch to ELF
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -5858,7 +5858,7 @@ _LT_EOF
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
- freebsd1*)
+ freebsd1.*)
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -5874,7 +5874,7 @@ _LT_EOF
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes