17db96d56Sopenharmony_cidiff --git a/config.sub b/config.sub 27db96d56Sopenharmony_ciindex d74fb6d..e5e15e4 100755 37db96d56Sopenharmony_ci--- a/config.sub 47db96d56Sopenharmony_ci+++ b/config.sub 57db96d56Sopenharmony_ci@@ -1748,7 +1748,7 @@ case $os in 67db96d56Sopenharmony_ci | skyos* | haiku* | rdos* | toppers* | drops* | es* \ 77db96d56Sopenharmony_ci | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ 87db96d56Sopenharmony_ci | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ 97db96d56Sopenharmony_ci- | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr*) 107db96d56Sopenharmony_ci+ | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* | ohos*) 117db96d56Sopenharmony_ci ;; 127db96d56Sopenharmony_ci # This one is extra strict with allowed versions 137db96d56Sopenharmony_ci sco3.2v2 | sco3.2v[4-9]* | sco5v6*) 147db96d56Sopenharmony_ci@@ -1786,6 +1786,8 @@ case $kernel-$os in 157db96d56Sopenharmony_ci ;; 167db96d56Sopenharmony_ci *-eabi* | *-gnueabi*) 177db96d56Sopenharmony_ci ;; 187db96d56Sopenharmony_ci+ *-ohos*) 197db96d56Sopenharmony_ci+ ;; 207db96d56Sopenharmony_ci -*) 217db96d56Sopenharmony_ci # Blank kernel with real OS is always fine. 227db96d56Sopenharmony_ci ;; 237db96d56Sopenharmony_cidiff --git a/configure.ac b/configure.ac 247db96d56Sopenharmony_ciindex 5aa91cb..219426d 100644 257db96d56Sopenharmony_ci--- a/configure.ac 267db96d56Sopenharmony_ci+++ b/configure.ac 277db96d56Sopenharmony_ci@@ -742,6 +742,8 @@ cat >> conftest.c <<EOF 287db96d56Sopenharmony_ci # elif defined(__aarch64__) && defined(__AARCH64EL__) 297db96d56Sopenharmony_ci # if defined(__ILP32__) 307db96d56Sopenharmony_ci aarch64_ilp32-linux-gnu 317db96d56Sopenharmony_ci+# elif defined(__OHOS__) 327db96d56Sopenharmony_ci+ aarch64-linux-ohos 337db96d56Sopenharmony_ci # else 347db96d56Sopenharmony_ci aarch64-linux-gnu 357db96d56Sopenharmony_ci # endif 367db96d56Sopenharmony_ci@@ -760,8 +762,10 @@ cat >> conftest.c <<EOF 377db96d56Sopenharmony_ci armeb-linux-gnueabihf 387db96d56Sopenharmony_ci # endif 397db96d56Sopenharmony_ci # elif defined(__ARM_EABI__) && !defined(__ARM_PCS_VFP) 407db96d56Sopenharmony_ci-# if defined(__ARMEL__) 417db96d56Sopenharmony_ci+# if defined(__ARMEL__) && !defined(__OHOS__) 427db96d56Sopenharmony_ci arm-linux-gnueabi 437db96d56Sopenharmony_ci+# elif defined(__OHOS__) 447db96d56Sopenharmony_ci+ arm-linux-ohos 457db96d56Sopenharmony_ci # else 467db96d56Sopenharmony_ci armeb-linux-gnueabi 477db96d56Sopenharmony_ci # endif 487db96d56Sopenharmony_ci@@ -876,7 +880,7 @@ AC_MSG_CHECKING([for multiarch]) 497db96d56Sopenharmony_ci AS_CASE([$ac_sys_system], 507db96d56Sopenharmony_ci [Darwin*], [MULTIARCH=""], 517db96d56Sopenharmony_ci [FreeBSD*], [MULTIARCH=""], 527db96d56Sopenharmony_ci- [MULTIARCH=$($CC --print-multiarch 2>/dev/null)] 537db96d56Sopenharmony_ci+ [MULTIARCH=$($CC $CFLAGS --print-multiarch 2>/dev/null)] 547db96d56Sopenharmony_ci ) 557db96d56Sopenharmony_ci AC_SUBST([MULTIARCH]) 567db96d56Sopenharmony_ci AC_MSG_RESULT([$MULTIARCH]) 577db96d56Sopenharmony_cidiff --git a/setup.py b/setup.py 587db96d56Sopenharmony_ciindex 43e807f..b1d0c0a 100644 597db96d56Sopenharmony_ci--- a/setup.py 607db96d56Sopenharmony_ci+++ b/setup.py 617db96d56Sopenharmony_ci@@ -827,10 +827,11 @@ def configure_compiler(self): 627db96d56Sopenharmony_ci if not CROSS_COMPILING: 637db96d56Sopenharmony_ci add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 647db96d56Sopenharmony_ci add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') 657db96d56Sopenharmony_ci+ self.add_multiarch_paths() 667db96d56Sopenharmony_ci # only change this for cross builds for 3.3, issues on Mageia 677db96d56Sopenharmony_ci if CROSS_COMPILING: 687db96d56Sopenharmony_ci self.add_cross_compiling_paths() 697db96d56Sopenharmony_ci- self.add_multiarch_paths() 707db96d56Sopenharmony_ci+ self.compiler.add_library('python%s' % sys.version.split()[0][:4]) 717db96d56Sopenharmony_ci self.add_ldflags_cppflags() 727db96d56Sopenharmony_ci 737db96d56Sopenharmony_ci def init_inc_lib_dirs(self): 747db96d56Sopenharmony_cidiff --git a/support_ohos_ignorefile.txt b/support_ohos_ignorefile.txt 757db96d56Sopenharmony_cinew file mode 100644 767db96d56Sopenharmony_ciindex 0000000000..dc3802e6c5 777db96d56Sopenharmony_ci--- /dev/null 787db96d56Sopenharmony_ci+++ b/support_ohos_ignorefile.txt