sunfish marked an inline comment as done.
sunfish added inline comments.
================
Comment at: clang/test/Driver/wasm-toolchain.c:116
+// CHECK-COMMAND: clang{{.*}}" "-cc1" {{.*}} "-o" "[[temp:[^"]*]]"
+// CHECK-COMMAND: wasm-ld{{.*}}" "crt1.o" "[[temp]]" "-lc"
"{{.*[/\\]}}libclang_rt.builtins-wasm32.a" "-o" "a.out"
+
----------------
bjope wrote:
> sunfish wrote:
> > bjope wrote:
> > > bjope wrote:
> > > > This isn't working for me on redhat 7 servers. I get
> > > > ```
> > > > "wasm-ld" "-L/lib" "/lib/crt1.o" ...
> > > > ```
> > > > No idea why I get the full patch to crt1.o. But it's not matching with
> > > > the FileCheck pattern.
> > > /full patch/full path/
> > Would you be able to test whether the following patch fixes it?
> >
> > ```diff
> > diff --git a/clang/test/Driver/wasm-toolchain.c
> > b/clang/test/Driver/wasm-toolchain.c
> > index 8300a81614e..332e6048cc5 100644
> > --- a/clang/test/Driver/wasm-toolchain.c
> > +++ b/clang/test/Driver/wasm-toolchain.c
> > @@ -110,11 +110,11 @@
> >
> > // Basic exec-model tests.
> >
> > -// RUN: %clang %s -### -no-canonical-prefixes -target
> > wasm32-unknown-unknown -mexec-model=command 2>&1 \
> > +// RUN: %clang %s -### -no-canonical-prefixes -target
> > wasm32-unknown-unknown --sysroot=%s/no-sysroot-there -mexec-model=command
> > 2>&1 \
> > // RUN: | FileCheck -check-prefix=CHECK-COMMAND %s
> > // CHECK-COMMAND: clang{{.*}}" "-cc1" {{.*}} "-o" "[[temp:[^"]*]]"
> > // CHECK-COMMAND: wasm-ld{{.*}}" "crt1.o" "[[temp]]" "-lc"
> > "{{.*[/\\]}}libclang_rt.builtins-wasm32.a" "-o" "a.out"
> >
> > -// RUN: %clang %s -### -no-canonical-prefixes -target
> > wasm32-unknown-unknown -mexec-model=reactor 2>&1 \
> > +// RUN: %clang %s -### -no-canonical-prefixes -target
> > wasm32-unknown-unknown --sysroot=%s/no-sysroot-there -mexec-model=reactor
> > 2>&1 \
> > // RUN: | FileCheck -check-prefix=CHECK-REACTOR %s
> > // CHECK-REACTOR: wasm-ld{{.*}}" {{.*}} "--entry" "_initialize" {{.*}}
> > ```
> Yes, that is working.
Thanks for confirming! I've now committed this fix.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D62922/new/
https://reviews.llvm.org/D62922
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
