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

More work towards hybrid support

Browse Source 
* All packaging architecture dependent variables do now have a
  respective suffix and are set up for each configured packaging
  architecture, save for the kernel and boot loader variables, which
  are still only set up for the primary architecture.
  For convenience TARGET_PACKAGING_ARCH, TARGET_ARCH, TARGET_LIBSUPC++,
  and TARGET_LIBSTDC++ are set to the respective values for the primary
  packaging architecture by default.
* Introduce a set of MultiArch* rules to help with building targets for
  multiple packaging architectures. Generally the respective targets are
  (additionally) gristed with the packaging architecture. For libraries
  the additional grist is usually omitted for the primary architecture
  (e.g. libroot.so and <x86>libroot.so for x86_gcc2/x86 hybrid), so that
  Jamfiles for targets built only for the primary architecture don't
  need to be changed.
* Add multi-arch build support for all targets needed for the stage 1
  cross devel package as well as for libbe (untested).
This commit is contained in:
Ingo Weinhold
2013-08-01 08:54:06 +02:00
parent 159663ceba
commit b0944c78b0
338 changed files with 4208 additions and 3303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jamrules
+2 -35
View File
@@ -29,42 +29,8 @@ if ! $(buildConfig) {
LOCATE on BuildConfig = $(HAIKU_BUILD_OUTPUT_DIR) ;
include BuildConfig ;
# Set simplified variables for primary architecture.
# set HAIKU_PACKAGING_ARCH, the primary packaging architecture
HAIKU_PACKAGING_ARCH = $(HAIKU_PACKAGING_ARCHS[1]) ;
local variable ;
for variable in
HAIKU_GCC_RAW_VERSION
HAIKU_GCC_MACHINE
HAIKU_GCC_LIB_DIR
HAIKU_GCC_HEADERS_DIR
HAIKU_GCC_LIBGCC
HAIKU_GCC_LIBGCC_OBJECTS
HAIKU_CPU
HAIKU_STATIC_LIBSTDC++
HAIKU_SHARED_LIBSTDC++
HAIKU_STATIC_LIBSUPC++
HAIKU_SHARED_LIBSUPC++
HAIKU_C++_HEADERS_DIR
HAIKU_KERNEL_LIBGCC
HAIKU_KERNEL_LIBSUPC++
HAIKU_BOOT_LIBGCC
HAIKU_BOOT_LIBSUPC++
HAIKU_AR
HAIKU_CC
HAIKU_LD
HAIKU_OBJCOPY
HAIKU_RANLIB
HAIKU_ELFEDIT
HAIKU_STRIP
HAIKU_CPPFLAGS
HAIKU_CCFLAGS
HAIKU_C++FLAGS
HAIKU_LDFLAGS
HAIKU_ARFLAGS
HAIKU_UNARFLAGS
HAIKU_USE_GCC_GRAPHITE {
$(variable) = $($(variable)_$(HAIKU_PACKAGING_ARCH)) ;
}
# The build setup and rules are neatly organized in several files. Include
# them now. Start with the side-effect-less rules, since they are the most
@@ -73,6 +39,7 @@ for variable in
# optional user-defined UserBuildConfig is included thereafter.
include [ FDirName $(HAIKU_BUILD_RULES_DIR) HelperRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) MathRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) ArchitectureRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) BeOSRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) LocaleRules ] ;
include [ FDirName $(HAIKU_BUILD_RULES_DIR) CommandLineArguments ] ;