[flang] Fix cuda-option test on Darwin #85687
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
On Darwin, -isysroot is needed and is automatically appended to %flang and %flang_fc1, so use %flang_fc1 instead to have both -fc1 and -isysroot in the expected positions and avoid errors.
llvmbot
added
flang:driver
flang
|
@llvm/pr-subscribers-flang-driver Author: Leandro Lupori (luporl) ChangesOn Darwin, -isysroot is needed and is automatically appended to Full diff: https://github.com/llvm/llvm-project/pull/85687.diff 1 Files Affected:
diff --git a/flang/test/Driver/cuda-option.f90 b/flang/test/Driver/cuda-option.f90
index 112e1cb6c77f8c..562f8683b0ff7d 100644
--- a/flang/test/Driver/cuda-option.f90
+++ b/flang/test/Driver/cuda-option.f90
@@ -1,6 +1,6 @@
! Test -fcuda option
-! RUN: %flang -fc1 -cpp -x cuda -fdebug-unparse %s -o - | FileCheck %s
-! RUN: not %flang -fc1 -cpp %s -o - 2>&1 | FileCheck %s --check-prefix=ERROR
+! RUN: %flang_fc1 -cpp -x cuda -fdebug-unparse %s -o - | FileCheck %s
+! RUN: not %flang_fc1 -cpp %s -o - 2>&1 | FileCheck %s --check-prefix=ERROR
program main
#if _CUDA
integer :: var = _CUDA
|
clementval
approved these changes
Mar 18, 2024
SLTozer
added a commit
that referenced
this pull request
Mar 19, 2024
Reverted due to buildbot failures: https://lab.llvm.org/buildbot/#/builders/139/builds/61717/ This reverts commit b4b7d98.
SLTozer
added a commit
that referenced
this pull request
Mar 19, 2024
This commit was mistakenly reverted in place of the actual failing commit prior; reapplying. This reverts commit db4170a.
|
Apologies - I accidentally reverted this commit in place of another commit I'd merged that was breaking buildbots; I've reapplied it now. |
chencha3
pushed a commit
to chencha3/llvm-project
that referenced
this pull request
Mar 23, 2024
On Darwin, -isysroot is needed and is automatically appended to %flang and %flang_fc1, so use %flang_fc1 instead to have both -fc1 and -isysroot in the expected positions and avoid errors.
chencha3
pushed a commit
to chencha3/llvm-project
that referenced
this pull request
Mar 23, 2024
Reverted due to buildbot failures: https://lab.llvm.org/buildbot/#/builders/139/builds/61717/ This reverts commit b4b7d98.
chencha3
pushed a commit
to chencha3/llvm-project
that referenced
this pull request
Mar 23, 2024
This commit was mistakenly reverted in place of the actual failing commit prior; reapplying. This reverts commit db4170a.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
On Darwin, -isysroot is needed and is automatically appended to
%flang and %flang_fc1, so use %flang_fc1 instead to have both -fc1
and -isysroot in the expected positions and avoid errors.