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

Fix test_app_server build.

Browse Source 
Fixes #15536.
This commit is contained in:
Adrien Destugues
2019-12-31 13:15:30 +01:00
parent 620d0707d7
commit 32158f3d64
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/MainBuildRules
-5
View File
@@ -271,11 +271,6 @@ 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) ;
build/jam/SystemLibraryRules
+6
View File
@@ -22,6 +22,12 @@ 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)