Skip to content

Commit 4c3d949

Browse files
committed
Fix C/C++ library check command line
Compiler names may include spaces (such as `ccache gcc`).
1 parent 4dddeee commit 4c3d949

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

src/ansi-c/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ else
109109
platform_unavail = library/java.io.c library/threads.c
110110
endif
111111
library_check: library/*.c
112-
./library_check.sh $(CC) $(filter-out $(platform_unavail), $^)
112+
./library_check.sh "$(CC)" $(filter-out $(platform_unavail), $^)
113113
touch $@
114114

115115
cprover_library.inc: library/converter$(EXEEXT) library/*.c

src/ansi-c/library_check.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ for f in "$@"; do
1212
perl -p -i -e 's/(_mm_.fence)/s$1/' __libcheck.c
1313
perl -p -i -e 's/(__sync_)/s$1/' __libcheck.c
1414
perl -p -i -e 's/(__atomic_)/s$1/' __libcheck.c
15-
"$CC" -std=gnu99 -E -include library/cprover.h -D__CPROVER_bool=_Bool -D__CPROVER_thread_local=__thread -DLIBRARY_CHECK -o __libcheck.i __libcheck.c
16-
"$CC" -S -Wall -Werror -pedantic -Wextra -std=gnu99 __libcheck.i \
15+
$CC -std=gnu99 -E -include library/cprover.h -D__CPROVER_bool=_Bool -D__CPROVER_thread_local=__thread -DLIBRARY_CHECK -o __libcheck.i __libcheck.c
16+
$CC -S -Wall -Werror -pedantic -Wextra -std=gnu99 __libcheck.i \
1717
-o __libcheck.s -Wno-unused-label -Wno-unknown-pragmas
1818
ec="${?}"
1919
rm __libcheck.s __libcheck.i __libcheck.c

src/cpp/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ cprover_library$(OBJEXT): cprover_library.inc
6969
$(MAKE) -C ../ansi-c library/converter$(EXEEXT)
7070

7171
library_check: library/*.c
72-
../ansi-c/library_check.sh $(CC) $^
72+
../ansi-c/library_check.sh "$(CC)" $^
7373
touch $@
7474

7575
cprover_library.inc: ../ansi-c/library/converter$(EXEEXT) library/*.c

0 commit comments

Comments
 (0)