Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Rework gcc2 test_app_server build logic a bit.

This commit is contained in:
Augustin Cavalier 2020-01-05 17:17:41 -05:00
parent 6ca34a59b5
commit a1e74397a1
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/jam/MainBuildRules
View File

@ -271,6 +271,11 @@ rule CreateAsmStructOffsetsHeader header : source
local systemIncludesOption ; local systemIncludesOption ;
on $(header) { # use on $(1) variable values on $(header) { # use on $(1) variable values
if ! $(PLATFORM) in $(SUPPORTED_PLATFORMS) {
Echo $(PLATFORM) is not in SUPPORTED_PLATFORMS, cannot make struct-offsets header! ;
return ;
}
# headers and defines # headers and defines
headers = $(HAIKU_CONFIG_HEADERS) $(SEARCH_SOURCE) $(SUBDIRHDRS) headers = $(HAIKU_CONFIG_HEADERS) $(SEARCH_SOURCE) $(SUBDIRHDRS)
$(HDRS) ; $(HDRS) ;

6
build/jam/SystemLibraryRules
View File

@ -22,12 +22,6 @@ rule TargetLibstdc++ asPath
# Returns the c++-standard-library for the target. # Returns the c++-standard-library for the target.
# Invoking with <asPath> = true will return the full library path. # Invoking with <asPath> = true will return the full library path.
if $(TARGET_PLATFORM) = libbe_test {
if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
return stdc++.r4 ;
}
}
if $(TARGET_PLATFORM) = haiku || $(TARGET_PLATFORM) = libbe_test { if $(TARGET_PLATFORM) = haiku || $(TARGET_PLATFORM) = libbe_test {
if $(TARGET_PACKAGING_ARCH) = x86_gcc2 { if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
# the libstdc++.so for our legacy compiler (needs to be built) # the libstdc++.so for our legacy compiler (needs to be built)

2
src/libs/stdc++/legacy/Jamfile
View File

@ -1,5 +1,7 @@
SubDir HAIKU_TOP src libs stdc++ legacy ; SubDir HAIKU_TOP src libs stdc++ legacy ;
AddSubDirSupportedPlatforms libbe_test ;
local architectureObject ; local architectureObject ;
for architectureObject in [ MultiArchSubDirSetup x86_gcc2 ] { for architectureObject in [ MultiArchSubDirSetup x86_gcc2 ] {
on $(architectureObject) { on $(architectureObject) {