[Vm-dev] Issues: Trying to build the RS vm with the mvm script...
Tobias Pape
Das.Linux at gmx.de
Sat May 29 15:23:38 UTC 2021
> On 29. May 2021, at 17:20, Robert Withers <robert.withers at pm.me> wrote:
>
> Hi Tobias,
>
> Any progress on updating the fix_include_order branch? I have poked
> around with git and my local repo is all messed up with conflicts. I do
> not know how to dump all those merge attempts and be back at the HEAD of
> Cog. But also, you stated I need the fix_include_order branch to build
> on Linux. I want to build my plugins and test them!
>
Sorry, nothing much I can do :(
-t
> ---
> Kindly,
> Robert
>
>
> On 5/27/21 2:43 PM, Tobias Pape wrote:
>> Hi
>>
>>
>>> On 27. May 2021, at 20:34, Robert Withers <robert.withers at pm.me> wrote:
>>>
>>> I tried and got a conflicts error. Unsure how to proceed.
>>> rabbit at ganymede:~/vm-dev/opensmalltalk-vm$ git pull origin fix_include_order
>>> From https://github.com/OpenSmalltalk/opensmalltalk-vm
>>> * branch fix_include_order -> FETCH_HEAD
>>> Auto-merging stacksrc/vm/interp.c
>>> CONFLICT (content): Merge conflict in stacksrc/vm/interp.c
>>> ...
>>> Auto-merging spur64src/vm/cointerp.c
>>> CONFLICT (content): Merge conflict in spur64src/vm/cointerp.c
>>> Automatic merge failed; fix conflicts and then commit the result.
>> Darn, that branch has to be updated -.-
>> Nicolas might have an idea tho…
>>
>> Best regards
>> -tobias
>>
>>
>>> ---
>>> Kindly,
>>> Robert
>>>
>>>
>>> On 5/27/21 2:12 PM, Tobias Pape wrote:
>>>> Also, try the
>>>>
>>>> https://github.com/OpenSmalltalk/opensmalltalk-vm/tree/fix_include_order
>>>>
>>>> branch for the time being.
>>>>
>>>> Best regards
>>>> -tobias
>>>>
>>>>
>>>>> On 27. May 2021, at 20:04, Levente Uzonyi <leves at caesar.elte.hu>
>>>>> wrote:
>>>>>
>>>>> The VM uses clang instead of gcc. So, you need to install clang.
>>>>>
>>>>>
>>>>> Levente
>>>>>
>>
>
More information about the Vm-dev
mailing list