Skip to content

Add option to specify language of CSourceFiles#20687

Merged
ifreund merged 2 commits intoziglang:masterfrom
GalaxyShard:master
Jan 30, 2025
Merged

Add option to specify language of CSourceFiles#20687
ifreund merged 2 commits intoziglang:masterfrom
GalaxyShard:master

Conversation

@GalaxyShard
Copy link
Contributor

@GalaxyShard GalaxyShard commented Jul 20, 2024 •
edited
Loading

Closes #20655

The addCSourceFile functions gain an optional language field which defaults to the current behavior (find the language by the file extension of each input).

This does not add support for any new languages beyond what addCSourceFile already supports: the C languages and assembly.

@GalaxyShard GalaxyShard force-pushed the master branch 2 times, most recently from 2156522 to f73ed36 Compare July 21, 2024 04:26
@GalaxyShard GalaxyShard changed the title Add std.Build.Module.addForeignSourceFile (non-breaking) Add option to specify language of CSourceFiles Jul 21, 2024
@GalaxyShard GalaxyShard mentioned this pull request Jul 21, 2024
Closed
@xxxbxxx
Copy link
Contributor

xxxbxxx commented Jul 22, 2024

I have a similar commit in #17956:
650a335

The main difference is that I don't put the -x flag inside the --cflags ... -- section since it is recognized by zig. But I don't know which one is correct/best...

@GalaxyShard
Copy link
Contributor Author

GalaxyShard commented Jul 22, 2024

I have a similar commit in #17956: 650a335

The main difference is that I don't put the -x flag inside the --cflags ... -- section since it is recognized by zig. But I don't know which one is correct/best...

Actually the -x flag is outside of the cflags section in this PR as well, so it gets handled by src/main.zig instead of getting passed as a C flag.

I did notice though, in your PR there is no -x none after the source files were added. If I'm not mistaken, doing addCSourceFile once specifying a language (lets say C), then doing another addCSourceFile not specifying a language, would result in both files being forced to compile as a C file, even if the second file is C++ or something else.

@GalaxyShard GalaxyShard force-pushed the master branch 2 times, most recently from 6581419 to c4dfa85 Compare July 23, 2024 19:35
@xxxbxxx
Copy link
Contributor

xxxbxxx commented Jul 24, 2024

I have a similar commit in #17956: 650a335
The main difference is that I don't put the -x flag inside the --cflags ... -- section since it is recognized by zig. But I don't know which one is correct/best...

Actually the -x flag is outside of the cflags section in this PR as well, so it gets handled by src/main.zig instead of getting passed as a C flag.

ah my bad, I casually read the diff in the web interface and misread.

I did notice though, in your PR there is no -x none after the source files were added. If I'm not mistaken, doing addCSourceFile once specifying a language (lets say C), then doing another addCSourceFile not specifying a language, would result in both files being forced to compile as a C file, even if the second file is C++ or something else.

You're right! thanks.

@GalaxyShard GalaxyShard force-pushed the master branch 3 times, most recently from 4b6eb4d to 54bf51e Compare August 1, 2024 02:25
@GalaxyShard GalaxyShard force-pushed the master branch 2 times, most recently from fdb4981 to 1bc8dd6 Compare August 22, 2024 01:32
@GalaxyShard
Copy link
Contributor Author

GalaxyShard commented Jan 28, 2025

Is there anything that needs to be done before merging? Thanks.

@alexrp alexrp added this to the 0.14.0 milestone Jan 30, 2025
ifreund
ifreund approved these changes Jan 30, 2025
View reviewed changes
Copy link
Member

@ifreund ifreund left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, sorry for the long wait :/

@ifreund ifreund merged commit a3ee521 into ziglang:master Jan 30, 2025
10 checks passed
@alexrp alexrp mentioned this pull request Jan 31, 2025
Closed
xxxbxxx added a commit to xxxbxxx/zig that referenced this pull request Feb 20, 2025
@xxxbxxx
sts.Build: Add a test for the use case "single c-header library"
5670891 
which is now supported thanks to ziglang#20687

The same source.h file can be both a c-header to include, and compiled as a C file (with a #define as toggle.

closes ziglang#19423
@alexrp alexrp removed this from the 0.14.0 milestone Feb 21, 2025
@xdBronch xdBronch mentioned this pull request Sep 2, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ifreund ifreund ifreund approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Assembly files with .s extension may contain macros, incompatible with zig's extension-based detection which expects .S

4 participants

@GalaxyShard @xxxbxxx @ifreund @alexrp