i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up FreeBSD build support as suggested by Ingo.

Browse Source
This commit is contained in:
Rene Gollent
2013-09-29 19:50:00 -04:00
committed by Rene Gollent
parent 3d97f9a0a9
commit 6114dd1fc2
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+8
View File
@@ -266,6 +266,10 @@ if $(HOST_PLATFORM) = cygwin {
--enable-auto-import ; --enable-auto-import ;
} }
if $(HOST_PLATFORM) = freebsd {
HOST_LINKFLAGS += -L/usr/local/lib ;
}
HOST_CPU ?= $(OSPLAT:L) ; HOST_CPU ?= $(OSPLAT:L) ;
# Jam doesn't know x86_64, so override HOST_CPU, if 64 bit. # Jam doesn't know x86_64, so override HOST_CPU, if 64 bit.
@@ -571,6 +575,10 @@ HOST_BE_API_C++FLAGS = ;
# platform, e.g. containing missing POSIX/GNU headers. # platform, e.g. containing missing POSIX/GNU headers.
HOST_HDRS += [ FDirName $(HAIKU_TOP) headers build host $(HOST_PLATFORM) ] ; HOST_HDRS += [ FDirName $(HAIKU_TOP) headers build host $(HOST_PLATFORM) ] ;
if $(HOST_PLATFORM) = freebsd {
HOST_HDRS += /usr/local/include ;
}
HOST_BE_API_HEADERS = HOST_BE_API_HEADERS =
[ FDirName $(HAIKU_TOP) headers build ] [ FDirName $(HAIKU_TOP) headers build ]
[ FDirName $(HAIKU_TOP) headers build os ] [ FDirName $(HAIKU_TOP) headers build os ]
src/build/libpackage/Jamfile
-7
View File
@@ -87,13 +87,6 @@ if $(HOST_PLATFORM) = haiku_host && $(HOST_GCC_VERSION[1]) < 3 {
SourceHdrs FetchFileJob.cpp : /boot/$(locations)/develop/headers/curl ; SourceHdrs FetchFileJob.cpp : /boot/$(locations)/develop/headers/curl ;
} }
# FreeBSD's gcc doesn't have /usr/local/include and /usr/local/lib in its
# default search paths, but that's where its libcurl port gets installed to.
if $(HOST_PLATFORM) = freebsd {
SourceHdrs FetchFileJob.cpp : /usr/local/include ;
LINKFLAGS on libpackage_build.so += -L/usr/local/lib ;
}
# locate the library # locate the library
MakeLocate libpackage_build.so : $(HOST_BUILD_COMPATIBILITY_LIB_DIR) ; MakeLocate libpackage_build.so : $(HOST_BUILD_COMPATIBILITY_LIB_DIR) ;