Skip to content

Commit c4b52ef

Browse files
authored
Merge pull request #3624 from ioraff/no-perl
rewrite perl scripts in universal shell
2 parents d0c3504 + 42c7a27 commit c4b52ef

File tree

9 files changed

+4738
-4735
lines changed

9 files changed

+4738
-4735
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ endif()
245245

246246
if (APPLE AND DYNAMIC_ARCH AND BUILD_SHARED_LIBS)
247247
set (CMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS 1)
248-
if (NOT NOFORTRAN)
248+
if (NOT NOFORTRAN)
249249
set (CMAKE_Fortran_USE_RESPONSE_FILE_FOR_OBJECTS 1)
250250
set (CMAKE_Fortran_CREATE_SHARED_LIBRARY
251251
"sh -c 'cat ${CMAKE_BINARY_DIR}/CMakeFiles/openblas_shared.dir/objects*.rsp | xargs -n 1024 ar -ru libopenblas.a && exit 0' "
@@ -395,7 +395,7 @@ if (BUILD_SHARED_LIBS AND NOT ${SYMBOLPREFIX}${SYMBOLSUFFIX} STREQUAL "")
395395
endif()
396396

397397
add_custom_command(TARGET ${OpenBLAS_LIBNAME}_shared POST_BUILD
398-
COMMAND perl ${PROJECT_SOURCE_DIR}/exports/gensymbol "objcopy" "${ARCH}" "${BU}" "${EXPRECISION_IN}" "${NO_CBLAS_IN}" "${NO_LAPACK_IN}" "${NO_LAPACKE_IN}" "${NEED2UNDERSCORES_IN}" "${ONLY_CBLAS_IN}" \"${SYMBOLPREFIX}\" \"${SYMBOLSUFFIX}\" "${BUILD_LAPACK_DEPRECATED}" > ${PROJECT_BINARY_DIR}/objcopy.def
398+
COMMAND ${PROJECT_SOURCE_DIR}/exports/gensymbol "objcopy" "${ARCH}" "${BU}" "${EXPRECISION_IN}" "${NO_CBLAS_IN}" "${NO_LAPACK_IN}" "${NO_LAPACKE_IN}" "${NEED2UNDERSCORES_IN}" "${ONLY_CBLAS_IN}" \"${SYMBOLPREFIX}\" \"${SYMBOLSUFFIX}\" "${BUILD_LAPACK_DEPRECATED}" > ${PROJECT_BINARY_DIR}/objcopy.def
399399
COMMAND objcopy -v --redefine-syms ${PROJECT_BINARY_DIR}/objcopy.def ${PROJECT_BINARY_DIR}/lib/lib${OpenBLAS_LIBNAME}.so
400400
COMMENT "renaming symbols"
401401
)

Makefile.prebuild

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

5656
$(TARGET_CONF): c_check f_check getarch
57-
perl ./c_check $(TARGET_MAKE) $(TARGET_CONF) $(CC) $(TARGET_FLAGS) $(CFLAGS)
57+
./c_check $(TARGET_MAKE) $(TARGET_CONF) $(CC) $(TARGET_FLAGS) $(CFLAGS)
5858
ifneq ($(ONLY_CBLAS), 1)
59-
perl ./f_check $(TARGET_MAKE) $(TARGET_CONF) $(FC) $(TARGET_FLAGS)
59+
./f_check $(TARGET_MAKE) $(TARGET_CONF) $(FC) $(TARGET_FLAGS)
6060
else
6161
#When we only build CBLAS, we set NOFORTRAN=2
6262
echo "NOFORTRAN=2" >> $(TARGET_MAKE)
@@ -71,8 +71,8 @@ endif
7171

7272

7373
getarch : getarch.c cpuid.S dummy $(CPUIDEMU)
74-
avx512=$$(perl c_check - - $(CC) $(TARGET_FLAGS) $(CFLAGS) | grep NO_AVX512); \
75-
rv64gv=$$(perl c_check - - $(CC) $(TARGET_FLAGS) $(CFLAGS) | grep NO_RV64GV); \
74+
avx512=$$(./c_check - - $(CC) $(TARGET_FLAGS) $(CFLAGS) | grep NO_AVX512); \
75+
rv64gv=$$(./c_check - - $(CC) $(TARGET_FLAGS) $(CFLAGS) | grep NO_RV64GV); \
7676
$(HOSTCC) $(HOST_CFLAGS) $(EXFLAGS) $${avx512:+-D$${avx512}} $${rv64gv:+-D$${rv64gv}} -o $(@F) getarch.c cpuid.S $(CPUIDEMU)
7777

7878
getarch_2nd : getarch_2nd.c $(TARGET_CONF) dummy

0 commit comments

Comments
 (0)