Skip to content

Fix compiling with Haiku#4140

Closed
kainjow wants to merge 1 commit into
libgit2:masterfrom
kainjow:patch-1
Closed

Fix compiling with Haiku#4140
kainjow wants to merge 1 commit into
libgit2:masterfrom
kainjow:patch-1

Conversation

@kainjow

@kainjow kainjow commented Feb 25, 2017

Copy link
Copy Markdown
Contributor

No description provided.

@pks-t

pks-t commented Feb 27, 2017

Copy link
Copy Markdown
Member

I'd like to not include platform-specific logic whenever possible. This could be implemented as follows:

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bfd1b499..f31bdb28b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -464,7 +464,9 @@ IF (MSVC)
    # Precompiled headers
 
 ELSE ()
-	SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -Wall -Wextra ${CMAKE_C_FLAGS}")
+	SET(CMAKE_C_FLAGS "-D_GNU_SOURCE -Wall ${CMAKE_C_FLAGS}")
+
+	ADD_C_FLAG_IF_SUPPORTED(-Wextra)
 
 	IF (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
 		SET(CMAKE_C_FLAGS "-std=c99 -D_POSIX_C_SOURCE=200112L -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS ${CMAKE_C_FLAGS}")

@kainjow

kainjow commented Feb 27, 2017

Copy link
Copy Markdown
Contributor Author

yeah that would be a better fix. I'll try it out and report back.

@kainjow

kainjow commented Mar 1, 2017

Copy link
Copy Markdown
Contributor Author

That change works 👍

@pks-t

pks-t commented Mar 1, 2017

Copy link
Copy Markdown
Member

Want to change your PR accordingly or shall I just merge my own commit?

@kainjow

kainjow commented Mar 1, 2017

Copy link
Copy Markdown
Contributor Author

You can do your own.

@pks-t pks-t mentioned this pull request Mar 1, 2017
Merged
@pks-t

pks-t commented Mar 1, 2017

Copy link
Copy Markdown
Member

Fixed via #4148

@pks-t pks-t closed this Mar 1, 2017
@pks-t

pks-t commented Mar 1, 2017

Copy link
Copy Markdown
Member

By the way, thanks for reporting and the initial fix 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@kainjow @pks-t