1175413 - Move MOZ_ICU_CFLAGS usages to moz.build

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Makoto Kato [:m_kato]]

We already can use CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS'] in moz.build instead of LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS) in Makefile.in

Comment 1

[Makoto Kato [:m_kato]]

Attachment: Cleanup usages of MOZ_ICU_CFLAGS

Comment 2

[Makoto Kato [:m_kato]]

Comment on attachment 8623494 [details] [diff] [review]
Cleanup usages of MOZ_ICU_CFLAGS

We already can use CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS'] in moz.build

Comment 3

[Michael Shal [:mshal]]

Comment on attachment 8623494 [details] [diff] [review]
Cleanup usages of MOZ_ICU_CFLAGS

>-# ICU headers need to be available whether we build with the complete
>-# Internationalization API or not - ICU stubs rely on them.
>-
>-LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
>-
>-ifdef ENABLE_INTL_API
>-ifndef MOZ_NATIVE_ICU
>-
>-endif
>-endif

According to this comment, it sounds like the CFLAGS/CXXFLAGS assignments in moz.build should be outside the CONFIG['ENABLE_INTL_API'] block, right? Or is there a reason that's no longer the case?

> if CONFIG['ENABLE_INTL_API']:
>+    CFLAGS += CONFIG['MOZ_ICU_CFLAGS']
>+    CXXFLAGS += CONFIG['MOZ_ICU_CFLAGS']

Comment 4

[Makoto Kato [:m_kato]]

(In reply to Michael Shal [:mshal] from comment #3)
> Comment on attachment 8623494 [details] [diff] [review]
> Cleanup usages of MOZ_ICU_CFLAGS
> 
> >-# ICU headers need to be available whether we build with the complete
> >-# Internationalization API or not - ICU stubs rely on them.
> >-
> >-LOCAL_INCLUDES += $(MOZ_ICU_CFLAGS)
> >-
> >-ifdef ENABLE_INTL_API
> >-ifndef MOZ_NATIVE_ICU
> >-
> >-endif
> >-endif
> 
> According to this comment, it sounds like the CFLAGS/CXXFLAGS assignments in
> moz.build should be outside the CONFIG['ENABLE_INTL_API'] block, right? Or
> is there a reason that's no longer the case?

Ah, OK. I don't use if condition.

Comment 5

[Makoto Kato [:m_kato]]

Attachment: Cleanup usages of MOZ_ICU_CFLAGS v2

Comment 6

[Makoto Kato [:m_kato]]

url:        https://hg.mozilla.org/integration/mozilla-inbound/rev/df05a32cdea63ffc8f134e979064404b0a6594a8
changeset:  df05a32cdea63ffc8f134e979064404b0a6594a8
user:       Makoto Kato <[e-mail]>
date:       Thu Jul 23 09:53:48 2015 +0900
description:
Bug 1175413 - Cleanup usages of MOZ_ICU_CFLAGS. r=mshal

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/df05a32cdea6