js/buildsys
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only use OBJCXXFLAGS and CPPFLAGS with OBJCXX

Browse source
This commit is contained in:
Jonathan Schleifer 2017-04-18 01:50:21 +02:00
parent 932a1fc478
commit 060bcd3202
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
buildsys.mk.in
View file

@ -201,7 +201,7 @@ depend: pre-depend ${SRCS}
{ rm -f $@; false; } { rm -f $@; false; }
.mm.mm.dep: .mm.mm.dep:
${CPP} ${CPPFLAGS} ${OBJCPPFLAGS} -M $< | \ ${CPP} ${CPPFLAGS} ${OBJCXXFLAGS} -M $< | \
sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \ sed 's/^\([^\.]*\)\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
{ rm -f $@; false; } { rm -f $@; false; }
@ -513,7 +513,7 @@ locales: ${MO_FILES}
${COMPILE_STATUS} ${COMPILE_STATUS}
in="$<"; \ in="$<"; \
out="$@"; \ out="$@"; \
if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \ if ${OBJCXX} ${OBJCXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
${COMPILE_OK}; \ ${COMPILE_OK}; \
else \ else \
${COMPILE_FAILED}; \ ${COMPILE_FAILED}; \
@ -522,7 +522,7 @@ locales: ${MO_FILES}
${COMPILE_LIB_STATUS} ${COMPILE_LIB_STATUS}
in="$<"; \ in="$<"; \
out="$@"; \ out="$@"; \
if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \ if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
${COMPILE_LIB_OK}; \ ${COMPILE_LIB_OK}; \
else \ else \
${COMPILE_LIB_FAILED}; \ ${COMPILE_LIB_FAILED}; \
@ -531,7 +531,7 @@ locales: ${MO_FILES}
${COMPILE_PLUGIN_STATUS} ${COMPILE_PLUGIN_STATUS}
in="$<"; \ in="$<"; \
out="$@"; \ out="$@"; \
if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \ if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$@} -c -o $@ $<; then \
${COMPILE_PLUGIN_OK}; \ ${COMPILE_PLUGIN_OK}; \
else \ else \
${COMPILE_PLUGIN_FAILED}; \ ${COMPILE_PLUGIN_FAILED}; \