From 63830f14a919147b46e2afac5cd5b5fced6c0b1e Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Thu, 21 Nov 2024 10:26:49 +0000 Subject: [PATCH] CMakeLists.txt: tiny fix to instructions comment. Now that our downstream picolibc changes are in the form of multiple patches in a subdirectory, it's better to apply them with 'git am' so they turn into separate commits, instead of 'git apply', the same way we do it for llvm-project. --- CMakeLists.txt | 2 +- docs/building-from-source.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b24a36b4..b8942842 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,7 @@ # git -C repos clone https://github.com/llvm/llvm-project.git # git -C repos/llvm-project am -k $PWD/patches/llvm-project/*.patch # git -C repos clone https://github.com/picolibc/picolibc.git -# git -C repos/picolibc apply $PWD/patches/picolibc/*.patch +# git -C repos/picolibc am -k $PWD/patches/picolibc/*.patch # mkdir build # cd build # cmake .. -GNinja -DFETCHCONTENT_SOURCE_DIR_LLVMPROJECT=../repos/llvm-project -DFETCHCONTENT_SOURCE_DIR_PICOLIBC=../repos/picolibc diff --git a/docs/building-from-source.md b/docs/building-from-source.md index 8bf5cd57..9dcf6027 100644 --- a/docs/building-from-source.md +++ b/docs/building-from-source.md @@ -89,7 +89,7 @@ mkdir repos git -C repos clone https://github.com/llvm/llvm-project.git git -C repos/llvm-project am -k "$PWD"/patches/llvm-project/*.patch git -C repos clone https://github.com/picolibc/picolibc.git -git -C repos/picolibc apply "$PWD"/patches/picolibc/*.patch +git -C repos/picolibc am -k "$PWD"/patches/picolibc/*.patch mkdir build cd build cmake .. -GNinja -DFETCHCONTENT_SOURCE_DIR_LLVMPROJECT=../repos/llvm-project -DFETCHCONTENT_SOURCE_DIR_PICOLIBC=../repos/picolibc