[PATCH] Upstreaming changes to support Rust on Bitrig

[Dave Huseby]

Updated the patch by modifying autoconf/configure.ac and re-running autoconf/AutoRegen.sh as per review feedback.

The changes to Makefile.config.in are to get the output paths for the documentation correct for Bitrig only when compiling for Bitrig.


http://reviews.llvm.org/D7543

Files:
  Makefile.config.in
  autoconf/config.sub
  autoconf/configure.ac
  configure

Index: Makefile.config.in
===================================================================
--- Makefile.config.in
+++ Makefile.config.in
@@ -117,12 +117,6 @@
 # Target operating system for which LLVM will compile for.
 TARGET_OS=@TARGET_OS@
 
-# Adjust paths for Bitrig
-ifeq ($(TARGET_OS),Bitrig)
-PROJ_docsdir    := $(PROJ_prefix)/share/docs/llvm
-PROJ_mandir     := $(PROJ_prefix)/man
-endif
-
 # Host hardware architecture
 HOST_ARCH=@HOST_ARCH@
 # Target hardware architecture
Index: autoconf/config.sub
===================================================================
--- autoconf/config.sub
+++ autoconf/config.sub
@@ -1354,7 +1354,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -bitrig*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
Index: autoconf/configure.ac
===================================================================
--- autoconf/configure.ac
+++ autoconf/configure.ac
@@ -267,11 +267,6 @@
     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
     llvm_cv_os_type="DragonFly"
     llvm_cv_platform_type="Unix" ;;
-  *-*-bitrig*)
-    llvm_cv_link_all_option="-Wl,--whole-archive"
-    llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
-    llvm_cv_os_type="Bitrig"
-    llvm_cv_platform_type="Unix" ;;
   *-*-hpux*)
     llvm_cv_link_all_option="-Wl,--whole-archive"
     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
@@ -352,8 +347,6 @@
     llvm_cv_target_os_type="NetBSD" ;;
   *-*-dragonfly*)
     llvm_cv_target_os_type="DragonFly" ;;
-  *-*-bitrig*)
-    llvm_cv_target_os_type="Bitrig" ;;
   *-*-hpux*)
     llvm_cv_target_os_type="HP-UX" ;;
   *-*-interix*)
Index: configure
===================================================================
--- configure
+++ configure
@@ -3966,11 +3966,6 @@
     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
     llvm_cv_os_type="DragonFly"
     llvm_cv_platform_type="Unix" ;;
-  *-*-bitrig*)
-    llvm_cv_link_all_option="-Wl,--whole-archive"
-    llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
-    llvm_cv_os_type="Bitrig"
-    llvm_cv_platform_type="Unix" ;;
   *-*-hpux*)
     llvm_cv_link_all_option="-Wl,--whole-archive"
     llvm_cv_no_link_all_option="-Wl,--no-whole-archive"
@@ -4057,8 +4052,6 @@
     llvm_cv_target_os_type="NetBSD" ;;
   *-*-dragonfly*)
     llvm_cv_target_os_type="DragonFly" ;;
-  *-*-bitrig*)
-    llvm_cv_target_os_type="Bitrig" ;;
   *-*-hpux*)
     llvm_cv_target_os_type="HP-UX" ;;
   *-*-interix*)

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D7543.20601.patch
Type: text/x-patch
Size: 2765 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150224/1f74fe78/attachment.bin>