You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2013/05/04 19:58:27 UTC
[lucy-commits] [3/4] git commit: refs/heads/master - Regenerate charmonizer.c
Regenerate charmonizer.c
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/27c95151
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/27c95151
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/27c95151
Branch: refs/heads/master
Commit: 27c95151888fbaa5bd47c0e9ea8f2bac45fd1c3a
Parents: 9844674
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sat May 4 18:18:33 2013 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sat May 4 19:03:19 2013 +0200
----------------------------------------------------------------------
clownfish/compiler/common/charmonizer.c | 6 ++++--
clownfish/runtime/common/charmonizer.c | 6 ++++--
common/charmonizer.c | 6 ++++--
3 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/27c95151/clownfish/compiler/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/compiler/common/charmonizer.c b/clownfish/compiler/common/charmonizer.c
index c76bf71..4bb9d67 100644
--- a/clownfish/compiler/common/charmonizer.c
+++ b/clownfish/compiler/common/charmonizer.c
@@ -1328,7 +1328,9 @@ chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags) {
void
chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
const char *string;
- if (flags->style != CHAZ_CFLAGS_STYLE_GNU) {
+ if (flags->style != CHAZ_CFLAGS_STYLE_GNU
+ || strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0
+ ) {
return;
}
if (chaz_OS_is_darwin()) {
@@ -1784,7 +1786,7 @@ chaz_CC_shared_lib_file(const char *name) {
const char *prefix = "";
const char *shlib_ext = chaz_OS_shared_lib_ext();
if (!chaz_CC.intval__MSC_VER) {
- if (strcmp(chaz_OS_name(), "cygwin") == 0) {
+ if (chaz_OS_is_cygwin()) {
prefix = "cyg";
}
else {
http://git-wip-us.apache.org/repos/asf/lucy/blob/27c95151/clownfish/runtime/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/clownfish/runtime/common/charmonizer.c b/clownfish/runtime/common/charmonizer.c
index f239ff1..4651ef7 100644
--- a/clownfish/runtime/common/charmonizer.c
+++ b/clownfish/runtime/common/charmonizer.c
@@ -1607,7 +1607,9 @@ chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags) {
void
chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
const char *string;
- if (flags->style != CHAZ_CFLAGS_STYLE_GNU) {
+ if (flags->style != CHAZ_CFLAGS_STYLE_GNU
+ || strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0
+ ) {
return;
}
if (chaz_OS_is_darwin()) {
@@ -2063,7 +2065,7 @@ chaz_CC_shared_lib_file(const char *name) {
const char *prefix = "";
const char *shlib_ext = chaz_OS_shared_lib_ext();
if (!chaz_CC.intval__MSC_VER) {
- if (strcmp(chaz_OS_name(), "cygwin") == 0) {
+ if (chaz_OS_is_cygwin()) {
prefix = "cyg";
}
else {
http://git-wip-us.apache.org/repos/asf/lucy/blob/27c95151/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 04d5e0d..2acbf3d 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -1607,7 +1607,9 @@ chaz_CFlags_set_warnings_as_errors(chaz_CFlags *flags) {
void
chaz_CFlags_compile_shared_library(chaz_CFlags *flags) {
const char *string;
- if (flags->style != CHAZ_CFLAGS_STYLE_GNU) {
+ if (flags->style != CHAZ_CFLAGS_STYLE_GNU
+ || strcmp(chaz_OS_shared_lib_ext(), ".dll") == 0
+ ) {
return;
}
if (chaz_OS_is_darwin()) {
@@ -2063,7 +2065,7 @@ chaz_CC_shared_lib_file(const char *name) {
const char *prefix = "";
const char *shlib_ext = chaz_OS_shared_lib_ext();
if (!chaz_CC.intval__MSC_VER) {
- if (strcmp(chaz_OS_name(), "cygwin") == 0) {
+ if (chaz_OS_is_cygwin()) {
prefix = "cyg";
}
else {