Changed the way the zip archive with the alternative gcc libraries is built.
Now that's done like building the network boot archive, which gives us a lot more flexibility for defining its contents. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30850 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -29,6 +29,15 @@ HAIKU_CONTAINER_GRIST on $(HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME)
|
||||
HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME)
|
||||
= HAIKU_NET_BOOT_ARCHIVE_INSTALL_TARGETS ;
|
||||
|
||||
# alternative gcc archive
|
||||
HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME
|
||||
= haiku-alternative-gcc-archive-container ;
|
||||
HAIKU_CONTAINER_GRIST on $(HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME)
|
||||
= AlternativeGCCArchive ;
|
||||
# HAIKU_INCLUDE_IN_CONTAINER_VAR -- update only mode not supported
|
||||
HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_ALTERNATIVE_GCC_ARCHIVE_CONTAINER_NAME)
|
||||
= HAIKU_ALTERNATIVE_GCC_ARCHIVE_INSTALL_TARGETS ;
|
||||
|
||||
# boot floppy
|
||||
HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME = haiku-boot-floppy-container ;
|
||||
HAIKU_CONTAINER_GRIST on $(HAIKU_FLOPPY_BOOT_IMAGE_CONTAINER_NAME)
|
||||
@@ -133,6 +142,13 @@ if $(HAIKU_GCC_VERSION[1]) = 2 {
|
||||
HAIKU_GCC_HEADERS_DIR = [ FDirName $(HAIKU_TOP) headers build gcc-2.95.3 ] ;
|
||||
}
|
||||
|
||||
# the subdirectory into which the alternative GCC libraries are to be installed
|
||||
if $(HAIKU_GCC_VERSION[1]) = 2 {
|
||||
HAIKU_ALTERNATIVE_GCC_LIB_SUBDIR = gcc2 ;
|
||||
} else {
|
||||
HAIKU_ALTERNATIVE_GCC_LIB_SUBDIR = gcc4 ;
|
||||
}
|
||||
|
||||
# initial state for flags etc.
|
||||
HAIKU_C++ ?= $(HAIKU_CC) ;
|
||||
HAIKU_LINK = $(HAIKU_CC) ;
|
||||
|
||||
Reference in New Issue
Block a user