Skip to content

Commit aaaecdb

Browse files
committed
Allow CC to contain space
Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
1 parent 0946b1e commit aaaecdb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Makefile.prebuild

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ all: getarch_2nd
6060
./getarch_2nd 1 >> $(TARGET_CONF)
6161

6262
$(TARGET_CONF): c_check$(SCRIPTSUFFIX) f_check$(SCRIPTSUFFIX) getarch
63-
./c_check$(SCRIPTSUFFIX) $(TARGET_MAKE) $(TARGET_CONF) $(CC) $(TARGET_FLAGS) $(CFLAGS)
63+
./c_check$(SCRIPTSUFFIX) $(TARGET_MAKE) $(TARGET_CONF) "$(CC)" "$(TARGET_FLAGS) $(CFLAGS)"
6464
ifneq ($(ONLY_CBLAS), 1)
65-
./f_check$(SCRIPTSUFFIX) $(TARGET_MAKE) $(TARGET_CONF) $(FC) $(TARGET_FLAGS)
65+
./f_check$(SCRIPTSUFFIX) $(TARGET_MAKE) $(TARGET_CONF) "$(FC)" "$(TARGET_FLAGS)"
6666
else
6767
#When we only build CBLAS, we set NOFORTRAN=2
6868
echo "NOFORTRAN=2" >> $(TARGET_MAKE)
@@ -77,8 +77,8 @@ endif
7777

7878

7979
getarch : getarch.c cpuid.S dummy $(CPUIDEMU)
80-
avx512=$$(./c_check$(SCRIPTSUFFIX) - - $(CC) $(TARGET_FLAGS) $(CFLAGS) | grep NO_AVX512); \
81-
rv64gv=$$(./c_check$(SCRIPTSUFFIX) - - $(CC) $(TARGET_FLAGS) $(CFLAGS) | grep NO_RV64GV); \
80+
avx512=$$(./c_check$(SCRIPTSUFFIX) - - "$(CC)" "$(TARGET_FLAGS) $(CFLAGS)" | grep NO_AVX512); \
81+
rv64gv=$$(./c_check$(SCRIPTSUFFIX) - - "$(CC)" "$(TARGET_FLAGS) $(CFLAGS)" | grep NO_RV64GV); \
8282
$(HOSTCC) $(HOST_CFLAGS) $(EXFLAGS) $${avx512:+-D$${avx512}} $${rv64gv:+-D$${rv64gv}} -o $(@F) getarch.c cpuid.S $(CPUIDEMU)
8383

8484
getarch_2nd : getarch_2nd.c $(TARGET_CONF) dummy

c_check

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ flags="$*"
3131

3232
cross_suffix=""
3333

34-
if [ "`dirname $compiler_name`" != '.' ]; then
35-
cross_suffix="$cross_suffix`dirname $compiler_name`/"
34+
if [ "`dirname \"$compiler_name\"`" != '.' ]; then
35+
cross_suffix="$cross_suffix`dirname \"$compiler_name\"`/"
3636
fi
3737

3838
bn=`basename $compiler_name`

0 commit comments

Comments
 (0)