Attachment #85379 for bug #96711




    end if

	'' set script file
	ldcline += " -T \"@GENTOO_FREEBASIC@/elf_i386.x\""

    if( len( fbc.mapfile ) > 0) then
        ldcline += " -Map " + fbc.mapfile

	ldcline += " -L \"" + libdir + QUOTE

    '' and the current path to libs search list
    ldcline += " -L \"./\" -L \"@GENTOO_GCC_LIB_PATH@\""

    '' add additional user-specified library search paths
    for i = 0 to fbc.pths-1

		ldcline += " \"" + libdir + "/crt1.o\""
	end if
	ldcline += " \"" + libdir + "/crti.o\""
	ldcline += " \"@GENTOO_GCC_LIB_PATH@/crtbegin.o\""

    '' init lib group
    ldcline += " -( "

    ldcline += "-) "

	'' crt end stuff
	ldcline += " \"@GENTOO_GCC_LIB_PATH@/crtend.o\""
	ldcline += " \"" + libdir + "/crtn.o\""

    '' invoke ld

Lines 391-399 Link Here

(-)fb.bas.orig (-2 / +2 lines)
391	pathTB(FB_PATH_LIB) = "\\lib\\dos"	391	pathTB(FB_PATH_LIB) = "\\lib\\dos"
392		392
393	case FB_COMPTARGET_LINUX	393	case FB_COMPTARGET_LINUX
394	pathTB(FB_PATH_BIN) = "\\bin\\linux\\"	394	pathTB(FB_PATH_BIN) = "\\usr\\bin\\"
395	pathTB(FB_PATH_INC) = "\\inc\\"	395	pathTB(FB_PATH_INC) = "\\inc\\"
396	pathTB(FB_PATH_LIB) = "\\lib\\linux"	396	pathTB(FB_PATH_LIB) = "\\usr\\lib"
397		397
398	case FB_COMPTARGET_XBOX	398	case FB_COMPTARGET_XBOX
399	pathTB(FB_PATH_BIN) = "\\bin\\win32\\"	399	pathTB(FB_PATH_BIN) = "\\bin\\win32\\"

Return to bug 96711

Lines 107-113 Link Here

(-)fbc_linux.bas.orig (-4 / +4 lines)
107	end if	107	end if
108		108
109	'' set script file	109	'' set script file
110	ldcline += " -T \"" + bindir + "elf_i386.x\""	110	ldcline += " -T \"@GENTOO_FREEBASIC@/elf_i386.x\""
111		111
112	if( len( fbc.mapfile ) > 0) then	112	if( len( fbc.mapfile ) > 0) then
113	ldcline += " -Map " + fbc.mapfile	113	ldcline += " -Map " + fbc.mapfile
Lines 138-144 Link Here
138	ldcline += " -L \"" + libdir + QUOTE	138	ldcline += " -L \"" + libdir + QUOTE
139		139
140	'' and the current path to libs search list	140	'' and the current path to libs search list
141	ldcline += " -L \"./\""	141	ldcline += " -L \"./\" -L \"@GENTOO_GCC_LIB_PATH@\""
142		142
143	'' add additional user-specified library search paths	143	'' add additional user-specified library search paths
144	for i = 0 to fbc.pths-1	144	for i = 0 to fbc.pths-1
Lines 150-156 Link Here
150	ldcline += " \"" + libdir + "/crt1.o\""	150	ldcline += " \"" + libdir + "/crt1.o\""
151	end if	151	end if
152	ldcline += " \"" + libdir + "/crti.o\""	152	ldcline += " \"" + libdir + "/crti.o\""
153	ldcline += " \"" + libdir + "/crtbegin.o\""	153	ldcline += " \"@GENTOO_GCC_LIB_PATH@/crtbegin.o\""
154		154
155	'' init lib group	155	'' init lib group
156	ldcline += " -( "	156	ldcline += " -( "
Lines 166-172 Link Here
166	ldcline += "-) "	166	ldcline += "-) "
167		167
168	'' crt end stuff	168	'' crt end stuff
169	ldcline += " \"" + libdir + "/crtend.o\""	169	ldcline += " \"@GENTOO_GCC_LIB_PATH@/crtend.o\""
170	ldcline += " \"" + libdir + "/crtn.o\""	170	ldcline += " \"" + libdir + "/crtn.o\""
171		171
172	'' invoke ld	172	'' invoke ld