20000-05-21 H.J. Lu (hjl@gnu.org)
* configure: Revert changes made on May 18 and May 19.
        * Makefile.in (CC_FOR_TARGET): Make sure as/ld in the gcc
        directory are used if they exist. Make sure
        $(build_tooldir)/include is searched for header files,
        $(build_tooldir)/lib/ for library files.
        (GCC_FOR_TARGET): Likewise.
        (CXX_FOR_TARGET): Likewise.
			
			
This commit is contained in:
		
							parent
							
								
									6cb613a428
								
							
						
					
					
						commit
						c9ae5a27b3
					
				
							
								
								
									
										11
									
								
								ChangeLog
								
								
								
								
							
							
						
						
									
										11
									
								
								ChangeLog
								
								
								
								
							|  | @ -1,3 +1,14 @@ | |||
| 20000-05-21  H.J. Lu  (hjl@gnu.org) | ||||
| 
 | ||||
| 	* configure: Revert changes made on May 18 and May 19. | ||||
| 
 | ||||
|         * Makefile.in (CC_FOR_TARGET): Make sure as/ld in the gcc | ||||
|         directory are used if they exist. Make sure | ||||
|         $(build_tooldir)/include is searched for header files, | ||||
|         $(build_tooldir)/lib/ for library files. | ||||
| 	(GCC_FOR_TARGET): Likewise. | ||||
|         (CXX_FOR_TARGET): Likewise. | ||||
| 
 | ||||
| 20000-05-19  H.J. Lu  (hjl@gnu.org) | ||||
| 
 | ||||
| 	* configure: Provide --disable-target-dir-sanity-checking to | ||||
|  |  | |||
|  | @ -223,7 +223,7 @@ CC_FOR_TARGET = ` \ | |||
| 	  ;; \
 | ||||
|       esac \
 | ||||
|     else \
 | ||||
|       echo $$r/gcc/xgcc -B$$r/gcc/; \
 | ||||
|       echo $$r/gcc/xgcc -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -B$$r/gcc/ -isystem $(build_tooldir)/include; \
 | ||||
|     fi; \
 | ||||
|   else \
 | ||||
|     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
 | ||||
|  | @ -237,7 +237,7 @@ CC_FOR_TARGET = ` \ | |||
| # variable is passed down to the gcc Makefile, where it is used to
 | ||||
| # build libgcc2.a.  We define it here so that it can itself be
 | ||||
| # overridden on the command line.
 | ||||
| GCC_FOR_TARGET = $$r/gcc/xgcc -B$$r/gcc/ | ||||
| GCC_FOR_TARGET = $$r/gcc/xgcc -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -B$$r/gcc/ -I$(build_tooldir)/include | ||||
| 
 | ||||
| CHILL_FOR_TARGET = ` \
 | ||||
|   if [ -f $$r/gcc/xgcc ] ; then \
 | ||||
|  | @ -262,7 +262,7 @@ CXX_FOR_TARGET = ` \ | |||
| 	  ;; \
 | ||||
|       esac \
 | ||||
|     else \
 | ||||
|       echo $$r/gcc/xgcc -B$$r/gcc/; \
 | ||||
|       echo $$r/gcc/g++ -B$(build_tooldir)/bin/ -B$(build_tooldir)/lib/ -B$$r/gcc/ -I$(build_tooldir)/include; \
 | ||||
|     fi; \
 | ||||
|   else \
 | ||||
|     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
 | ||||
|  |  | |||
|  | @ -753,30 +753,6 @@ target_vendor=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` | |||
| target_os=`echo $result | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` | ||||
| target=${target_cpu}-${target_vendor}-${target_os} | ||||
| 
 | ||||
| # We have to make sure the gcc directory exists for the non-canadian | ||||
| # cross compiler if necessary. In that case, we will run the cross | ||||
| # compiler we just build to compile other stuff. Due to how the cross | ||||
| # compiler finds the C header files, the gcc directory may be needed | ||||
| # for successful cross-compilation. This sanity check can be disabled | ||||
| # by passing | ||||
| # | ||||
| #	--disable-target-dir-sanity-checking | ||||
| # | ||||
| # to configure. | ||||
| if test x${target} != x${build} && test x${build} = x${host} ; then | ||||
|     if test x${enable_target_dir_sanity_checking} != xno \ | ||||
|        && test x${gcc_version} != x \ | ||||
|        && test -d ${prefix}/${target_alias} \ | ||||
|        && test ! -d ${prefix}/lib/gcc-lib/${target_alias}/${gcc_version} ; then | ||||
|     	echo "Please create the directory:" 1>&2 | ||||
|     	echo 1>&2 | ||||
| 	echo "	${prefix}/lib/gcc-lib/${target_alias}/${gcc_version}" 1>&2 | ||||
|     	echo 1>&2 | ||||
|     	echo "first for successful cross-compilation." 1>&2 | ||||
| 	exit 1 | ||||
|     fi | ||||
| fi | ||||
| 
 | ||||
| . ${tmpfile}.tgt | ||||
| 
 | ||||
| # Find the source files, if location was not specified. | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue