Skip to content

Commit

Permalink
Clean up some old dangling build system issues :D.
Browse files Browse the repository at this point in the history
  • Loading branch information
saurik committed May 17, 2024
1 parent ffdfae8 commit 02b12db
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 20 deletions.
2 changes: 1 addition & 1 deletion env/target-apl.mk
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ include $(pwd)/kit-default.mk
else

define _
more/$(1) += -target $(host/$(1))18.5.0
more/$(1) += -target $(host/$(1))19
endef
$(each)

Expand Down
7 changes: 1 addition & 6 deletions env/target-win.mk
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,7 @@ lflags += -Wl,-Xlink=-force:multiple
cflags += -DWIN32_LEAN_AND_MEAN=
cflags += -D_CRT_RAND_S=

# XXX: this breaks std::to_string(uint64_t)
# https://github.com/llvm/llvm-project/issues/52709
#cflags += -fms-extensions

#cflags += -fms-compatibility
#cflags += -D__GNUC__
cflags += -mno-ms-bitfields

# warning: 'I64' length modifier is not supported by ISO C
qflags += -Wno-format-non-iso
Expand Down
6 changes: 0 additions & 6 deletions lib-shared/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,16 @@ source += $(pwd)/cppcoro/lib/win32.cpp
endif


#source += $(pwd)/boost/libs/regex/src/regex_traits_defaults.cpp
source += $(wildcard $(pwd)/boost/libs/filesystem/src/*.cpp)
source += $(wildcard $(pwd)/boost/libs/json/src/*.cpp)
source += $(wildcard $(pwd)/boost/libs/program_options/src/*.cpp)
source += $(wildcard $(pwd)/boost/libs/random/src/*.cpp)
source += $(wildcard $(pwd)/boost/libs/regex/src/*.cpp)

# XXX: https://github.com/boostorg/beast/issues/2282
checks/$(pwd)/source/base64.cpp += -clang-analyzer-core.UndefinedBinaryOperatorResult

cflags/$(pwd)/boost/libs/filesystem/src/unique_path.cpp += -Wno-unused-function

ifeq ($(target),win)
cflags/$(pwd)/boost/libs/filesystem/src/operations.cpp += -Wno-unused-const-variable
# XXX https://github.com/boostorg/filesystem/issues/206
cflags/$(pwd)/boost/libs/filesystem/src/path.cpp += -Wno-inconsistent-missing-override
cflags/$(pwd)/boost/libs/filesystem/src/windows_file_codecvt.cpp += -Wno-inconsistent-missing-override
endif

Expand Down
3 changes: 0 additions & 3 deletions min-v8/target-lnx.mk
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,3 @@ include $(pwd)/target-psx.mk

v8src += $(filter %-linux.cc,$(v8all))
v8src += $(pwd)/v8/src/base/platform/platform-linux.cc

# XXX: https://bugs.chromium.org/p/v8/issues/detail?id=12682
chacks/$(pwd/v8)/src/base/platform/platform-posix.cc += /OS::CreateSharedMemoryHandleForTesting/,/^}/d;
4 changes: 0 additions & 4 deletions min-v8/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,6 @@ cflags += -DU_SHOW_INTERNAL_API

# XXX: -fno-exceptions -fno-rtti

# XXX: consider making this a global decision
#chacks/$(pwd/v8)/src/./profiler/heap-snapshot-generator.cc += s/V8_CC_MSVC/1/
cflags += -mno-ms-bitfields

# this might have to become global if that bitfield is exported
cflags/$(pwd/v8)/ += -Wno-enum-constexpr-conversion

Expand Down
1 change: 1 addition & 0 deletions min-webrtc/target.mk
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@ chacks/$(pwd/webrtc)/pc/rtc_stats_collector.cc += s/rtc::make_ref_counted<RTCSta
# XXX: https://bugs.chromium.org/p/webrtc/issues/detail?id=12967
chacks/$(pwd/webrtc)/p2p/base/dtls_transport.cc += /Should not happen\./,/;/d;

# XXX: just chacks/ this fwrite to somehow access orc::Log
# XXX: a bug needs to be filed for this :/
# vpn/p2p/rtc/webrtc/rtc_base/checks.cc:49:3: error: ignoring return value of function declared with 'warn_unused_result' attribute [-Werror,-Wunused-result]
# fwrite(output.data(), output.size(), 1, stderr);
Expand Down

0 comments on commit 02b12db

Please sign in to comment.