Skip to content

Commit 9bdf690

Browse files
committed
fix ci after fbsd edits lol
1 parent fa3d1c5 commit 9bdf690

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

.github/actions/3-build-cross/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,4 +159,4 @@ runs:
159159
${{ inputs.cmake_flags }}
160160
${{ inputs.with_pgo == 'true' && '-DDFLAGS_LDC=-fprofile-use=../pgo-ldc/merged.profdata' || '' }}
161161
${{ env.CROSS_CMAKE_FLAGS }}
162-
build_targets: ldc2 ldmd2 ldc-build-runtime ldc-build-plugin ldc-profdata ldc-profgen ldc-prune-cache timetrace2txt
162+
build_targets: ldc2 ldmd2 ldc-build-runtime ldc-build-plugin ldc-profdata ldc-prune-cache timetrace2txt

.github/actions/5-install/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
cd ..
2222
else
2323
mkdir -p install/bin
24-
cp build-cross/bin/{ldc2,ldmd2,ldc-build-runtime,ldc-profdata,ldc-profgen,ldc-prune-cache,timetrace2txt} install/bin/
24+
cp build-cross/bin/{ldc2,ldmd2,ldc-build-runtime,ldc-profdata,ldc-prune-cache,timetrace2txt} install/bin/
2525
cp build-cross/bin/ldc-build-plugin install/bin/ || true
2626
cp -R build-cross-libs/lib install/
2727
cp build-cross/lib/{libldc_rt.*,libLTO-ldc.dylib,LLVMgold-ldc.so} install/lib/ || true

druntime/src/etc/linux/memoryerror.d

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost Software License 1.0).
66
* (See accompanying file LICENSE_1_0.txt)
77
* Authors: Amaury SECHET, FeepingCreature, Vladimir Panteleev
8-
* Source: $(DRUNTIMESRC etc/linux/memory.d)
8+
* Source: $(DRUNTIMESRC etc/linux/memoryerror.d)
99
*/
1010

1111
module etc.linux.memoryerror;
@@ -45,7 +45,7 @@ else version (MemoryErrorSupported)
4545

4646
version (AnySupported):
4747

48-
import core.sys.posix.signal;
48+
import core.sys.posix.signal : SA_SIGINFO, sigaction, sigaction_t, siginfo_t, SIGSEGV;
4949
import ucontext = core.sys.posix.ucontext;
5050

5151
version (MemoryAssertSupported)

ldc/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,9 @@ endif()
777777
set(LDC_EXE_FULL ${PROJECT_BINARY_DIR}/bin/${LDC_EXE_NAME}${CMAKE_EXECUTABLE_SUFFIX})
778778
set(LDMD_EXE_FULL ${PROJECT_BINARY_DIR}/bin/${LDMD_EXE_NAME}${CMAKE_EXECUTABLE_SUFFIX})
779779

780-
if(UNIX)
780+
if(APPLE)
781+
# intentionally blank
782+
elseif(UNIX)
781783
set(LLVM_LIBRARIES -lzstd ${LLVM_LIBRARIES})
782784
# FreeBSD needs this added explicitly to find zstd, i hope harmless on other systems
783785
list(APPEND LLVM_LDFLAGS "-L/usr/local/lib")

phobos/etc/c/zlib/gzguts.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
void* malloc(size_t size);
2727
void free(void*);
2828
void* calloc(size_t, size_t);
29+
size_t wcstombs(char*, const wchar_t*, size_t);
2930
# include <limits.h>
3031
#endif
3132

0 commit comments

Comments
 (0)