Skip to content

Fix runtime build rules in Makefile#5303

Merged
steven-johnson merged 1 commit intomasterfrom
srj/win-32
Sep 30, 2020
Merged

Fix runtime build rules in Makefile#5303
steven-johnson merged 1 commit intomasterfrom
srj/win-32

Conversation

@steven-johnson
Copy link
Contributor

@steven-johnson steven-johnson commented Sep 29, 2020

  • one of the Windows-specific runtime files had a 32-vs-64 glitch
  • CMake now uses fno-threadsafe-statics (instead of -std=gnu++98) to disable thread-safe static initialization; as a result, this allowed C++11 code requirements to creep in (via d3d12compute.cpp), but we didn't notice because the Makefile wasn't properly building that file due to the 32-vs-64 glitch. Fixed by updating the Makefile to use this flag instead (which was an overdue fix anyway).

@steven-johnson steven-johnson changed the title Fix minor 32-vs-64 naming glitch in Makefile runtime build rules Fix runtime build rules in Makefile Sep 29, 2020
- one of the Windows-specific runtime files had a 32-vs-64 glitch
- CMake now uses `fno-threadsafe-statics` (instead of `-std=gnu++98`) to disable thread-safe static initialization; as a result, this allowed C++11 code requirements to creep in (via d3d12compute.cpp), but we didn't notice because the Makefile wasn't properly building that file due to the 32-vs-64 glitch. Fixed by updating the Makefile to use this flag instead (which was an overdue fix anyway).
@abadams
Copy link
Member

abadams commented Sep 29, 2020

oops, thanks for the fix.

@steven-johnson steven-johnson merged commit dc89424 into master Sep 30, 2020
@steven-johnson steven-johnson deleted the srj/win-32 branch September 30, 2020 01:22
@alexreinking alexreinking added the backport me This change should be backported to release versions label Oct 16, 2020
@alexreinking alexreinking added this to the v10.0.1 milestone Oct 16, 2020
alexreinking pushed a commit that referenced this pull request Oct 16, 2020
Fix runtime build rules in Makefile
@alexreinking alexreinking removed the backport me This change should be backported to release versions label Oct 16, 2020
alexreinking pushed a commit that referenced this pull request Oct 18, 2020
Fix runtime build rules in Makefile
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants