Browse Source

- remove ld.so.conf parsing from makefiles: this was probably done because we
used to completely replace the default linker script under Linux (which
also includes search directories), and it's wrong in case of
cross-compiling

git-svn-id: trunk@44860 -

Jonas Maebe 5 years ago
parent
commit
f81dac4f6f
2 changed files with 209 additions and 226 deletions
  1. 207 219
      utils/fpcm/fpcmake.inc
  2. 2 7
      utils/fpcm/fpcmake.ini

File diff suppressed because it is too large
+ 207 - 219
utils/fpcm/fpcmake.inc


+ 2 - 7
utils/fpcm/fpcmake.ini

@@ -850,18 +850,13 @@ ifneq ($(CROSSGCC),)
 GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
 GCCLIBDIR:=$(shell dirname `$(CROSSGCC) -print-libgcc-file-name`)
 endif
 endif
 endif
 endif
-
-# Other libraries from ld.so.conf
-ifndef OTHERLIBDIR
-OTHERLIBDIR:=$(shell grep -v "^\#" /etc/ld.so.conf | awk '{ ORS=" "; print $1 }')
-endif
 endif
 endif
 
 
 ifdef inUnix
 ifdef inUnix
 ifeq ($(OS_SOURCE),netbsd)
 ifeq ($(OS_SOURCE),netbsd)
-OTHERLIBDIR+=/usr/pkg/lib
+OTHERLIBDIR:=/usr/pkg/lib
 endif
 endif
-export GCCLIBDIR OTHERLIB
+export GCCLIBDIR OTHERLIBDIR
 endif
 endif
 
 
 
 

Some files were not shown because too many files changed in this diff