Skip to content

Commit 1ee3a55

Browse files
Fix macOS build: match only gcc-N pattern, not gcc-ranlib-N
The previous glob 'gcc-*' matched gcc-ranlib-16 which is not a compiler. Use 'gcc-[0-9]*' to match only versioned gcc binaries like gcc-16. Also fix CXX derivation with bash parameter expansion. Signed-off-by: LUU QUANG MINH <Minh.LuuQuang@vn.bosch.com>
1 parent 18f5575 commit 1ee3a55

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

.github/workflows/macos-build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ jobs:
3030
- name: Configure CMake
3131
run: |
3232
GCC_DIR=$(brew --prefix gcc)/bin
33-
CC=$(ls "$GCC_DIR"/gcc-* | sort -V | tail -1)
34-
CXX=$(echo "$CC" | sed 's/gcc/g++/')
33+
CC=$(ls "$GCC_DIR"/gcc-[0-9]* | sort -V | tail -1)
34+
CXX=${CC/gcc/g++}
3535
echo "Using CC=$CC CXX=$CXX"
3636
cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
3737
-DWITH_DLT_COVERAGE=${{env.WITH_DLT_COVERAGE}} \

src/shared/dlt_common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5791,8 +5791,8 @@ DltReturnValue dlt_message_argument_print_v2(DltMessageV2 *msg,
57915791
uint32_t type_info, uint8_t **ptr,
57925792
int32_t *datalength, char *text,
57935793
size_t textlength, int byteLength,
5794-
int
5795-
__attribute__((unused)) verbose)
5794+
int __attribute__((unused))
5795+
verbose)
57965796
{
57975797
/* check null pointers */
57985798
if ((msg == NULL) || (ptr == NULL) || (datalength == NULL) ||

src/system/dlt-system-filetransfer.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ int flush_dir_send(FiletransferOptions const *opts, const char *compress_dir,
457457

458458
free(path_uncompressed); /*it is no more used. It would be
459459
transferred in next step. */
460-
} /*it is a .gz file */
460+
} /*it is a .gz file */
461461
else {
462462
/*uncompressed file. We can just resend it, the action to put it
463463
* here was a move action. */

0 commit comments

Comments
 (0)