On Friday, 15 June 2018 at 05:26:57 UTC, makedgreatagain wrote:
On Wednesday, 13 June 2018 at 02:33:22 UTC, Joakim wrote:
On Wednesday, 13 June 2018 at 02:18:55 UTC, makedgreatagain wrote:

When I cherry pick the commit 08041422, git report the IOS branch dose not have function `getCAssertFunctionName` , `DtoCAssert` there seems missing some old commit from IOS branch to ltsmaster branch. I don't know how many and how to compare to get all the missing commit to work.

Thanks for you help again.

Are you starting from the top, with the oldest commit first? Because the older commits supply those functions.

You may not want to cherry-pick if you're not used to doing it, and just apply the patch itself:

https://patch-diff.githubusercontent.com/raw/ldc-developers/ldc/pull/2748.diff

I has try a lot diff way, none of them work.


to apply this patch it should this error:

error: patch failed: driver/main.cpp:860
error: driver/main.cpp: patch does not apply
error: patch failed: gen/module.cpp:743
error: gen/module.cpp: patch does not apply

I use git apply --reject --whitespace=fix to patch and it working now.

but I can not build the llvm use Dan Olson script or cmake, it report error. (I can build new llvm without problem, but after I add some patch or merge it will break)

: command not found/apple/ldc-iphone-dev/llvm/autoconf/config.guess: line 6: : command not found/apple/ldc-iphone-dev/llvm/autoconf/config.guess: line 8: : command not found/apple/ldc-iphone-dev/llvm/autoconf/config.guess: line 28: : command not found/apple/ldc-iphone-dev/llvm/autoconf/config.guess: line 29: : command not found/apple/ldc-iphone-dev/llvm/autoconf/config.guess: line 40: : command not found/apple/ldc-iphone-dev/llvm/autoconf/config.guess: line 42: : command not found/apple/ldc-iphone-dev/llvm/autoconf/config.guess: line 54: : command not found/apple/ldc-iphone-dev/llvm/autoconf/config.guess: line 65: : command not found/apple/ldc-iphone-dev/llvm/autoconf/config.guess: line 68:
'var/root/.projects/apple/ldc-iphone-dev/llvm/autoconf/config.guess: line 71: 
syntax error near unexpected token `in
'var/root/.projects/apple/ldc-iphone-dev/llvm/autoconf/config.guess: line 71: ` 
 case $1 in
CMake Error at cmake/modules/GetHostTriple.cmake:24 (message):
  Failed to execute
/var/root/.projects/apple/ldc-iphone-dev/llvm/autoconf/config.guess
Call Stack (most recent call first):
  cmake/config-ix.cmake:333 (get_host_triple)
  CMakeLists.txt:336 (include)



Reply via email to