From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0064b401.pphosted.com (mx0b-0064b401.pphosted.com [205.220.178.238]) by sourceware.org (Postfix) with ESMTPS id 0F5763858431 for ; Wed, 22 Feb 2023 12:21:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 0F5763858431 Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=windriver.com Authentication-Results: sourceware.org; spf=none smtp.mailfrom=ala-lpggp3.wrs.com Received: from pps.filterd (m0250811.ppops.net [127.0.0.1]) by mx0a-0064b401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31MBIfbV031317; Wed, 22 Feb 2023 12:21:31 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=windriver.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=PPS06212021; bh=DpcEr6vzLB7Gv8AR8WNSs/tuJsL7dteEDFr1UqHof2Q=; b=IgN2Tg91b1Rvlhcn5yzXZRKU2RvIApkM740g2nrCTxbhMFtDFbHFKCOJE6nzv9F0D2ZF Sm6E2VP1X9XE/AkvuuYEGb1Y+JZBUcmXQGAqd9g3oIK4UNdKbMA5fLyphwfDGrIywhqu ixXimRZMHr3gEkzMXgzYur/7JMYcFAISHJ+QG+37r7l++UNHSl3pjAMKQ7L7peGt+3o+ FG+i1fuh9hbWpNkZUXRD5g1uvRMaS+cXmymgvVdEzkXdDM5xRZmcHkx4JTPbfQ6GBrfn 3Lpoj3mly+eOTLyHvrgHGsiSl2K4Mh9oYqZmKnoHquvGr1ZeTcUMaopPUCTv2yOXhOMm bg== Received: from ala-exchng02.corp.ad.wrs.com (unknown-82-254.windriver.com [147.11.82.254]) by mx0a-0064b401.pphosted.com (PPS) with ESMTPS id 3ntpd3uqdh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Wed, 22 Feb 2023 12:21:31 +0000 Received: from ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.18; Wed, 22 Feb 2023 04:21:30 -0800 Received: from ala-lpggp3.wrs.com (147.11.136.210) by ALA-EXCHNG02.corp.ad.wrs.com (147.11.82.254) with Microsoft SMTP Server id 15.1.2507.18 via Frontend Transport; Wed, 22 Feb 2023 04:21:30 -0800 Received: by ala-lpggp3.wrs.com (Postfix, from userid 23306) id 0725D90387C; Wed, 22 Feb 2023 04:21:30 -0800 (PST) From: Yash Shinde To: CC: , , Subject: [PATCH] Share work directories Date: Wed, 22 Feb 2023 04:19:04 -0800 Message-ID: <20230222121904.4087522-1-Yash.Shinde@windriver.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: 1fUieVOoFE-HRfEXiU6xuBHmPs3d6prq X-Proofpoint-ORIG-GUID: 1fUieVOoFE-HRfEXiU6xuBHmPs3d6prq X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-22_05,2023-02-22_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 impostorscore=0 priorityscore=1501 bulkscore=0 spamscore=0 malwarescore=0 mlxlogscore=999 clxscore=1011 lowpriorityscore=0 phishscore=0 adultscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2212070000 definitions=main-2302220109 X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,NO_DNS_FOR_FROM,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Khem Raj Fix configure and Makefile files to read the defaults.hand t-oe from build directory, so that the source can be shared between gcc-cross-initial, gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build which use a separate build directory compared to source directory. While compiling gcc-crosssdk-initial-x86_64 on some host, there is occasionally failure that test the existance of default.h doesn't work, the reason is tm_include_list='** defaults.h' rather than tm_include_list='** ./defaults.h'. So we add the test condition for this situation. gcc/ChangeLog: * configure * configure.ac * mkconfig.sh Signed-off-by: Khem Raj Signed-off-by: Hongxu Jia --- gcc/configure | 4 ++-- gcc/configure.ac | 4 ++-- gcc/mkconfig.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/configure b/gcc/configure index 254f9b6c943..ff2a3e26049 100755 --- a/gcc/configure +++ b/gcc/configure @@ -13471,8 +13471,8 @@ for f in $tm_file; do tm_include_list="${tm_include_list} $f" ;; defaults.h ) - tm_file_list="${tm_file_list} \$(srcdir)/$f" - tm_include_list="${tm_include_list} $f" + tm_file_list="${tm_file_list} ./$f" + tm_include_list="${tm_include_list} ./$f" ;; * ) tm_file_list="${tm_file_list} \$(srcdir)/config/$f" diff --git a/gcc/configure.ac b/gcc/configure.ac index 62bc908b991..d36830cf2fb 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -2336,8 +2336,8 @@ for f in $tm_file; do tm_include_list="${tm_include_list} $f" ;; defaults.h ) - tm_file_list="${tm_file_list} \$(srcdir)/$f" - tm_include_list="${tm_include_list} $f" + tm_file_list="${tm_file_list} ./$f" + tm_include_list="${tm_include_list} ./$f" ;; * ) tm_file_list="${tm_file_list} \$(srcdir)/config/$f" diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh index 054ede89647..3b2c2b9df37 100644 --- a/gcc/mkconfig.sh +++ b/gcc/mkconfig.sh @@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then if [ $# -ge 1 ]; then echo '#ifdef IN_GCC' >> ${output}T for file in "$@"; do - if test x"$file" = x"defaults.h"; then + if test x"$file" = x"./defaults.h" -o x"$file" = x"defaults.h"; then postpone_defaults_h="yes" else echo "# include \"$file\"" >> ${output}T @@ -106,7 +106,7 @@ esac # If we postponed including defaults.h, add the #include now. if test x"$postpone_defaults_h" = x"yes"; then - echo "# include \"defaults.h\"" >> ${output}T + echo "# include \"./defaults.h\"" >> ${output}T fi # Add multiple inclusion protection guard, part two. -- 2.39.0