# HG changeset patch # User Shinji KONO # Date 1607929073 -32400 # Node ID 8c6ae8783321f5204b4ad2fe14ef98ba83743c59 # Parent b7235d42396f75d635523b415f2c5b0b65985661 darwin cbclang path diff -r b7235d42396f -r 8c6ae8783321 src/gearsTools/pmake.pl --- a/src/gearsTools/pmake.pl Tue Sep 29 23:04:52 2020 +0900 +++ b/src/gearsTools/pmake.pl Mon Dec 14 15:57:53 2020 +0900 @@ -31,7 +31,13 @@ if ($^O =~ /darwin/){ my $armdir = "/usr/local/Cellar/arm-none-eabi-gcc/9-2019-q4-major"; $objcopy = "$armdir/bin/arm-none-eabi-objcopy"; - my $cbcmdir = "/usr/local/Cellar/cbc/llvm10"; + # my $cbcmdir = "/usr/local/Cellar/cbc/llvm10"; + my $cbcmdir = `brew info --formula cbc | grep llvm`; + chop $cbcmdir; + $cbcmdir =~ s/ .*//; + if (! -d $cbcmdir) { + die "cant' find cbclangdir $cbcmdir"; + } $cc = "$cbcmdir/bin/clang"; $asm = $cc; $cflags = qq| --target=armv6-linux-gnueabihf -I$xv6_src_dir/../cbclang/arm -B$armdir/bin/arm-none-eabi-