diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2018-04-18 05:25:26 +0300 |
|---|---|---|
| committer | Ludovic Henry <luhenry@microsoft.com> | 2018-04-18 05:25:26 +0300 |
| commit | 356dd453e8b2a173069f59ee1962a6613f4e4bad (patch) | |
| tree | 2beff28fb49cdeab4b09f7ed5ad9057aa32f8755 /sdks/builds | |
| parent | d6072d75549d7150ebc28f7397175e76ebf78762 (diff) | |
[sdks] Use the same directories for the downloaded and built llvm. (#8295)
Diffstat (limited to 'sdks/builds')
| -rwxr-xr-x | sdks/builds/download-llvm.sh | 9 | ||||
| -rw-r--r-- | sdks/builds/ios.mk | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/sdks/builds/download-llvm.sh b/sdks/builds/download-llvm.sh index 9fd1fd33210..53d89f499a7 100755 --- a/sdks/builds/download-llvm.sh +++ b/sdks/builds/download-llvm.sh @@ -12,7 +12,10 @@ rm -rf llvm-tmp mkdir -p llvm-tmp tar -xC llvm-tmp -f tmp.tar.gz rm -rf ../out/ios-{llvm32,llvm64} -mkdir -p ../out/ios-llvm32 ../out/ios-llvm64 -cp -r llvm-tmp/usr64/* ../out/ios-llvm64 -cp -r llvm-tmp/usr32/* ../out/ios-llvm32 +mkdir -p ../out/llvm-llvm32 ../out/llvm-llvm64 +cp -r llvm-tmp/usr64/* ../out/llvm-llvm64 +cp -r llvm-tmp/usr32/* ../out/llvm-llvm32 rm -rf llvm-tmp tmp.tar.gz +cd ../out +ln -sf llvm-llvm32 ios-llvm32 +ln -sf llvm-llvm64 ios-llvm64 diff --git a/sdks/builds/ios.mk b/sdks/builds/ios.mk index 9c658015aca..012ede6ce06 100644 --- a/sdks/builds/ios.mk +++ b/sdks/builds/ios.mk @@ -306,7 +306,7 @@ ifndef IGNORE_PACKAGE_LLVM build-ios-llvm: .stamp-ios-llvm-$(LLVM_HASH) -clean-ios-llvm: +clean-ios-llvm: clean-llvm-llvm32 clean-llvm-llvm64 $(RM) -rf ../out/ios-llvm64 ../out/ios-llvm32 .stamp-ios-llvm-$(LLVM_HASH) else |