⛏️ index : buildtools.git

b98135ed3af141eef903e08e7b4871bf940d217f [patch]

3e2b88bf86ae7f037da313d89b00b2de8027bda4

7a87db2a172a406b79540188a23e52491ad3b741

b98135ed3af141eef903e08e7b4871bf940d217f.tar.gz

gcc 4: Fix the library search paths

Due to the use of STARTFILE_PREFIX_SPEC the path containing the
libraries gcc provides (libstdc++ and friends) was missing. So
revert to the previously used STANDARD_STARTFILE_PREFIX_{1,2},
MD_STARTFILE_PREFIX method.

Diff

 gcc/gcc/config/haiku.h | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/gcc/gcc/config/haiku.h b/gcc/gcc/config/haiku.h
index e8a98de..8265616 100644
--- a/gcc/gcc/config/haiku.h
+++ b/gcc/gcc/config/haiku.h
@@ -158,6 +158,7 @@
    { "/boot/system/develop/headers/os/be_apps/NetPositive", 0, 0, 1, 1, 0 }, \
    { "/boot/system/develop/headers/os/be_apps/Tracker", 0, 0, 1, 1, 0 }, \
    { "/boot/system/develop/headers/3rdparty", 0, 0, 0, 1, 0 }, \
    	/* TODO: To be removed when libtiff has been outsourced. */\
    { "/boot/system/develop/headers/bsd", 0, 0, 1, 1, 0 }, \
    { "/boot/system/develop/headers/glibc", 0, 0, 1, 1, 0 }, \
    { "/boot/system/develop/headers/gnu", 0, 0, 1, 1, 0 }, \
@@ -174,18 +175,22 @@
/* With STANDARD_STARTFILE_PREFIX_{1,2} set to "/boot/common/develop/lib/"
   and "/boot/system/develop/lib/", MD_STARTFILE_PREFIX adds the last one of the
   standard paths. The user specific paths are set via LIBRARY_PATH_ENV. */
#undef STANDARD_STARTFILE_PREFIX_1
#undef STANDARD_STARTFILE_PREFIX_2
#undef MD_STARTFILE_PREFIX
#undef STARTFILE_PREFIX_SPEC
#ifdef HYBRID_SECONDARY
/* For a secondary compiler on a hybrid system, use alternative search paths.*/
#define STARTFILE_PREFIX_SPEC \
	"/boot/common/non-packaged/develop/lib/" HYBRID_SECONDARY "/" \
	" /boot/common/develop/lib/" HYBRID_SECONDARY "/" \
	" /boot/system/develop/lib/" HYBRID_SECONDARY "/"
#define STANDARD_STARTFILE_PREFIX_1 \
  "/boot/common/develop/lib/" HYBRID_SECONDARY "/"
#define STANDARD_STARTFILE_PREFIX_2 \
  "/boot/system/develop/lib/" HYBRID_SECONDARY "/"
#define MD_STARTFILE_PREFIX \
  "/boot/common/non-packaged/develop/lib/" HYBRID_SECONDARY "/"
#else /* HYBRID_SECONDARY */
#define STARTFILE_PREFIX_SPEC \
	"/boot/common/non-packaged/develop/lib/ \

	/boot/common/develop/lib/ \
	/boot/system/develop/lib/"
#define STANDARD_STARTFILE_PREFIX_1   "/boot/common/develop/lib/"
#define STANDARD_STARTFILE_PREFIX_2   "/boot/system/develop/lib/"
#define MD_STARTFILE_PREFIX           "/boot/common/non-packaged/develop/lib/"
#endif /* HYBRID_SECONDARY */

/* Haiku doesn't have a separate math library.  */