Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 278541 | Differences between
and this patch

Collapse All | Expand All

(-)build/premake/premake4/src/actions/make/make_cpp.lua.orig (-2 / +2 lines)
Lines 248-254 Link Here
248
		-- set up precompiled headers
248
		-- set up precompiled headers
249
		_.pchconfig(cfg)
249
		_.pchconfig(cfg)
250
				
250
				
251
		_p('  CFLAGS    += $(CPPFLAGS) $(ARCH) %s', table.concat(table.join(cc.getcflags(cfg), cfg.buildoptions), " "))
251
		_p('  CFLAGS    += $(CPPFLAGS) %s', table.concat(table.join(cc.getcflags(cfg), cfg.buildoptions), " "))
252
		_p('  CXXFLAGS  += $(CFLAGS) %s', table.concat(cc.getcxxflags(cfg), " "))
252
		_p('  CXXFLAGS  += $(CFLAGS) %s', table.concat(cc.getcxxflags(cfg), " "))
253
		_p('  LDFLAGS   += %s', table.concat(table.join(cc.getldflags(cfg), cfg.linkoptions, cc.getlibdirflags(cfg)), " "))
253
		_p('  LDFLAGS   += %s', table.concat(table.join(cc.getldflags(cfg), cfg.linkoptions, cc.getlibdirflags(cfg)), " "))
254
		_p('  LIBS      += %s %s', table.concat(cc.getlinkflags(cfg), " "), table.concat(cfg.gnuexternals, " "))
254
		_p('  LIBS      += %s %s', table.concat(cc.getlinkflags(cfg), " "), table.concat(cfg.gnuexternals, " "))
Lines 272-278 Link Here
272
			else
272
			else
273
				lddeps = '-Xlinker --start-group $(LDDEPS) -Xlinker --end-group'
273
				lddeps = '-Xlinker --start-group $(LDDEPS) -Xlinker --end-group'
274
			end
274
			end
275
			_p('  LINKCMD    = $(%s) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) %s $(LIBS)', 
275
			_p('  LINKCMD    = $(%s) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) %s $(LIBS)', 
276
			iif(cfg.language == "C", "CC", "CXX"), lddeps)
276
			iif(cfg.language == "C", "CC", "CXX"), lddeps)
277
		end
277
		end
278
		
278
		
(-)build/workspaces/update-workspaces.sh.orig (+2 lines)
Lines 62-67 Link Here
62
# Now build premake and run it to create the makefiles
62
# Now build premake and run it to create the makefiles
63
cd ../premake/premake4
63
cd ../premake/premake4
64
make -C build/gmake.unix ${JOBS} || die "Premake build failed"
64
make -C build/gmake.unix ${JOBS} || die "Premake build failed"
65
./bin/release/premake4 embed
66
make -C build/gmake.unix ${JOBS} || die "Premake build failed"
65
67
66
echo
68
echo
67
69

Return to bug 278541