From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by sourceware.org (Postfix) with ESMTP id 52057393BC34 for ; Mon, 30 Nov 2020 19:58:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 52057393BC34 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-530-3mJZcyDtPcu9_kbCsYgbyQ-1; Mon, 30 Nov 2020 14:58:47 -0500 X-MC-Unique: 3mJZcyDtPcu9_kbCsYgbyQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0BFC6817B81 for ; Mon, 30 Nov 2020 19:58:47 +0000 (UTC) Received: from localhost.localdomain (ovpn-114-226.phx2.redhat.com [10.3.114.226]) by smtp.corp.redhat.com (Postfix) with ESMTP id B94C85D6A8; Mon, 30 Nov 2020 19:58:46 +0000 (UTC) From: Tom Stellard To: systemtap@sourceware.org Subject: [PATCH 8/8] dtrace: Use -o option to specify output file for CPP Date: Mon, 30 Nov 2020 19:58:41 +0000 Message-Id: <20201130195841.26142-9-tstellar@redhat.com> In-Reply-To: <20201130195841.26142-1-tstellar@redhat.com> References: <20201130195841.26142-1-tstellar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-Spam-Status: No, score=-15.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: systemtap@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Systemtap mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Nov 2020 19:58:52 -0000 This makes dtrace work correctly with clang-cpp. clang-cpp does not support interpreting the second filename as an output file. --- dtrace.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dtrace.in b/dtrace.in index aa5f544a8..7cfe19c60 100644 --- a/dtrace.in +++ b/dtrace.in @@ -359,7 +359,7 @@ def main(): if s_filename != "" and use_cpp: (ignore, fname) = mkstemp(suffix=".d") cpp = os.environ.get("CPP", "cpp") - retcode = call(split(cpp) + includes + defines + [s_filename, fname]) + retcode = call(split(cpp) + includes + defines + [s_filename, '-o', fname]) if retcode != 0: print("\"cpp includes s_filename\" failed") usage() -- 2.26.2