diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku index 2ba2ad1ee7..bcd12e6823 100644 --- a/build/jam/packages/Haiku +++ b/build/jam/packages/Haiku @@ -91,11 +91,10 @@ AddLibrariesToPackage lib : [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ; # libnetwork.so replaces quite a few libraries -SYSTEM_LIBS_LIBNETWORK_ALIASES = libsocket.so libbind.so libnet.so ; - if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 { + local libNetworkAliases = libsocket.so libbind.so libnet.so ; local lib ; - for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) { + for lib in $(libNetworkAliases) { AddSymlinkToPackage lib : libnetwork.so : $(lib) ; } @@ -103,11 +102,6 @@ if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 { } -SYSTEM_LIBS_ALIASES = - $(SYSTEM_LIBS_LIBNETWORK_ALIASES) - libnetapi.so -; - # TODO: Remove when the packages have been rebuilt! AddSymlinkToPackage lib : libbe.so : liblocale.so ; diff --git a/build/jam/packages/HaikuBootstrap b/build/jam/packages/HaikuBootstrap index 92802243d1..b6eedd8da5 100644 --- a/build/jam/packages/HaikuBootstrap +++ b/build/jam/packages/HaikuBootstrap @@ -90,11 +90,10 @@ AddLibrariesToPackage lib : [ HaikuImageGetSystemLibs ] [ HaikuImageGetPrivateSystemLibs ] ; # libnetwork.so replaces quite a few libraries -SYSTEM_LIBS_LIBNETWORK_ALIASES = libsocket.so libbind.so libnet.so ; - if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 { + local libNetworkAliases = libsocket.so libbind.so libnet.so ; local lib ; - for lib in $(SYSTEM_LIBS_LIBNETWORK_ALIASES) { + for lib in $(libNetworkAliases) { AddSymlinkToPackage lib : libnetwork.so : $(lib) ; } @@ -102,11 +101,6 @@ if $(HAIKU_GCC_VERSION_$(architecture)[1]) = 2 { } -SYSTEM_LIBS_ALIASES = - $(SYSTEM_LIBS_LIBNETWORK_ALIASES) - libnetapi.so -; - # servers AddFilesToPackage servers : $(SYSTEM_SERVERS) ;