diff options
| author | Liam Hopkins <liamh@google.com> | 2019-07-12 09:15:55 -0700 |
|---|---|---|
| committer | Zach Marano <zmarano@google.com> | 2019-07-12 09:15:55 -0700 |
| commit | f8d3beb109f692a04ae61de314654624309e80ed (patch) | |
| tree | ec6e5ed57acb2d32207c6d31e3e7b60fdc813107 /packages | |
| parent | 22040e5f6365c048ca5838a87f026396803329f5 (diff) | |
| download | google-compute-image-packages-f8d3beb109f692a04ae61de314654624309e80ed.tar.gz | |
Specify cpp version in Makefile (#808)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/google-compute-engine-oslogin/src/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/packages/google-compute-engine-oslogin/src/Makefile b/packages/google-compute-engine-oslogin/src/Makefile index 96ee104..5251e66 100644 --- a/packages/google-compute-engine-oslogin/src/Makefile +++ b/packages/google-compute-engine-oslogin/src/Makefile @@ -1,11 +1,12 @@ SHELL = /bin/sh TOPDIR = $(realpath ..) -VERSION = 20190708.00 +VERSION = 20190711.00 CPPFLAGS = -Iinclude -I/usr/include/json-c -CXXFLAGS = -fPIC -Wall -g -CFLAGS = $(CXXFLAGS) -Wstrict-prototypes +FLAGS = -fPIC -Wall -g +CFLAGS = $(FLAGS) -Wstrict-prototypes +CXXFLAGS = $(FLAGS) -std=c++11 LDFLAGS = -shared -Wl,-soname,$(SONAME) LDLIBS = -lcurl -ljson-c @@ -59,10 +60,10 @@ $(PAM_ADMIN) : pam/pam_oslogin_admin.o utils.o # Utilities. google_authorized_keys : authorized_keys/authorized_keys.o utils.o - $(CXX) $(CXXFLAGS) $(CPPFLAGS) $^ -o $@ $(LDLIBS) + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -lboost_regex $^ -o $@ $(LDLIBS) google_oslogin_nss_cache: cache_refresh/cache_refresh.o utils.o - $(CXX) $(CXXFLAGS) $(CPPFLAGS) $^ -o $@ $(LDLIBS) + $(CXX) $(CXXFLAGS) $(CPPFLAGS) -lboost_regex $^ -o $@ $(LDLIBS) install: all install -d $(DESTDIR)$(LIBDIR) |